summaryrefslogtreecommitdiff
path: root/Lib/importlib/_bootstrap.py
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-05-26 06:03:19 +0000
committerMartin Panter <vadmium+py@gmail.com>2016-05-26 06:03:19 +0000
commit3e04d5b3068ac67cc01a32b1d5a51ac79c9df5a1 (patch)
tree31de97216c771e456051ddbe31fc338ddf0f8b9f /Lib/importlib/_bootstrap.py
parent4d4bc42c8b2b4b546b36e0c3ecb1e86d57017cee (diff)
parent46f50726a0047ae81d478c3a206f587b8f35ed08 (diff)
downloadcpython-git-3e04d5b3068ac67cc01a32b1d5a51ac79c9df5a1.tar.gz
Issue #27076: Merge spelling from 3.5
Diffstat (limited to 'Lib/importlib/_bootstrap.py')
-rw-r--r--Lib/importlib/_bootstrap.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index fa99f5600f..afc31ee5e8 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -1065,7 +1065,7 @@ def _calc___package__(globals):
def __import__(name, globals=None, locals=None, fromlist=(), level=0):
"""Import a module.
- The 'globals' argument is used to infer where the import is occuring from
+ The 'globals' argument is used to infer where the import is occurring from
to handle relative imports. The 'locals' argument is ignored. The
'fromlist' argument specifies what should exist as attributes on the module
being imported (e.g. ``from module import <fromlist>``). The 'level'