summaryrefslogtreecommitdiffstats
path: root/Lib/importlib
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-03-15 04:03:08 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-03-15 04:03:08 (GMT)
commit373089239b26e7445aa44a3501c7056cfa4c3728 (patch)
tree5f2f35ff686dfa64092b06b730ed9090f6492896 /Lib/importlib
parentdeaa678952dd437cb8cf9f697325705ad0855029 (diff)
parent4969f709cc07088a40574c05724d83cddc8fafc7 (diff)
downloadcpython-373089239b26e7445aa44a3501c7056cfa4c3728.zip
cpython-373089239b26e7445aa44a3501c7056cfa4c3728.tar.gz
cpython-373089239b26e7445aa44a3501c7056cfa4c3728.tar.bz2
#11515: Merge with 3.2.
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 87ff01f..a944bee 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.