Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge with 3.2.

This commit is contained in:
Ezio Melotti 2011-05-14 06:24:18 +03:00
parent c729c25615 3659f27ad3
commit 4e03e9dc8d
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/test/support.py
View File

@ -91,19 +91,15 @@ def import_module(name, deprecated=False):
def _save_and_remove_module(name, orig_modules): def _save_and_remove_module(name, orig_modules):
"""Helper function to save and remove a module from sys.modules """Helper function to save and remove a module from sys.modules
Return True if the module was in sys.modules, False otherwise.
Raise ImportError if the module can't be imported.""" Raise ImportError if the module can't be imported."""
saved = True # try to import the module and raise an error if it can't be imported
try: if name not in sys.modules:
orig_modules[name] = sys.modules[name]
except KeyError:
# try to import the module and raise an error if it can't be imported
__import__(name) __import__(name)
saved = False
else:
del sys.modules[name] del sys.modules[name]
return saved for modname in list(sys.modules):
if modname == name or modname.startswith(name + '.'):
orig_modules[modname] = sys.modules[modname]
del sys.modules[modname]
def _save_and_block_module(name, orig_modules): def _save_and_block_module(name, orig_modules):
"""Helper function to save and block a module in sys.modules """Helper function to save and block a module in sys.modules