summaryrefslogtreecommitdiffstats
path: root/Lib/importlib
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-03-15 03:59:46 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-03-15 03:59:46 (GMT)
commit4969f709cc07088a40574c05724d83cddc8fafc7 (patch)
treeddb254d02f2bd0c4d9d7c141f5f95521669042a0 /Lib/importlib
parentc48c19afe031d0a35a3d5aacddad4e113e1aeaf0 (diff)
parent42da663e6fe7ecbb89b17d596c76812a91bb99a4 (diff)
downloadcpython-4969f709cc07088a40574c05724d83cddc8fafc7.zip
cpython-4969f709cc07088a40574c05724d83cddc8fafc7.tar.gz
cpython-4969f709cc07088a40574c05724d83cddc8fafc7.tar.bz2
#11515: Merge with 3.1.
Diffstat (limited to 'Lib/importlib')
-rw-r--r--Lib/importlib/_bootstrap.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index cd7f5d6..425b8bf 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -152,7 +152,7 @@ def _check_name(method):
loader can handle.
The first argument (self) must define _name which the second argument is
- comapred against. If the comparison fails then ImportError is raised.
+ compared against. If the comparison fails then ImportError is raised.
"""
def inner(self, name, *args, **kwargs):
@@ -304,7 +304,7 @@ class _LoaderBasics:
def _bytes_from_bytecode(self, fullname, data, source_mtime):
"""Return the marshalled bytes from bytecode, verifying the magic
- number and timestamp alon the way.
+ number and timestamp along the way.
If source_mtime is None then skip the timestamp check.