summaryrefslogtreecommitdiffstats
path: root/Lib/imp.py
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2013-06-14 19:04:26 (GMT)
committerBrett Cannon <brett@python.org>2013-06-14 19:04:26 (GMT)
commit3fe35e65034de82c45e2d8fe1ebe4a2929c68453 (patch)
tree5417c105714337f251daf3eb8be5f6762d273d99 /Lib/imp.py
parent6f1057605b26c34b30c562a1b620984ed1211f39 (diff)
downloadcpython-3fe35e65034de82c45e2d8fe1ebe4a2929c68453.zip
cpython-3fe35e65034de82c45e2d8fe1ebe4a2929c68453.tar.gz
cpython-3fe35e65034de82c45e2d8fe1ebe4a2929c68453.tar.bz2
Issue #18193: Add importlib.reload(), documenting (but not
implementing in code) the deprecation of imp.reload(). Thanks to Berker Peksag for the patch.
Diffstat (limited to 'Lib/imp.py')
-rw-r--r--Lib/imp.py28
1 files changed, 5 insertions, 23 deletions
diff --git a/Lib/imp.py b/Lib/imp.py
index 5170b06..ad0fd6a 100644
--- a/Lib/imp.py
+++ b/Lib/imp.py
@@ -23,6 +23,7 @@ from importlib._bootstrap import cache_from_source, source_from_cache
from importlib import _bootstrap
from importlib import machinery
+import importlib
import os
import sys
import tokenize
@@ -246,31 +247,12 @@ def find_module(name, path=None):
return file, file_path, (suffix, mode, type_)
-_RELOADING = {}
-
def reload(module):
- """Reload the module and return it.
+ """**DEPRECATED**
+
+ Reload the module and return it.
The module must have been successfully imported before.
"""
- if not module or type(module) != type(sys):
- raise TypeError("reload() argument must be module")
- name = module.__name__
- if name not in sys.modules:
- msg = "module {} not in sys.modules"
- raise ImportError(msg.format(name), name=name)
- if name in _RELOADING:
- return _RELOADING[name]
- _RELOADING[name] = module
- try:
- parent_name = name.rpartition('.')[0]
- if parent_name and parent_name not in sys.modules:
- msg = "parent {!r} not in sys.modules"
- raise ImportError(msg.format(parentname), name=parent_name)
- return module.__loader__.load_module(name)
- finally:
- try:
- del _RELOADING[name]
- except KeyError:
- pass
+ return importlib.reload(module)