diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-05-14 06:02:25 +0300 |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-05-14 06:02:25 +0300 |
commit | 3c06dbd9531a4996db571d81a8319768d56030ae (patch) | |
tree | 059f3548e2ff2da6804ec7b9cf5f6257be9f8b6f /Lib | |
parent | fba3758032d9831b9cc4a717aa9fb02bbf9cc598 (diff) | |
download | cpython-3c06dbd9531a4996db571d81a8319768d56030ae.tar.gz |
Change import_fresh_module to work with packages.
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/test/test_support.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index df4d1241a6..04ab443a4b 100644 --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -84,19 +84,15 @@ def import_module(name, deprecated=False): def _save_and_remove_module(name, orig_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.""" - saved = True - try: - orig_modules[name] = sys.modules[name] - except KeyError: - # try to import the module and raise an error if it can't be imported + # try to import the module and raise an error if it can't be imported + if name not in sys.modules: __import__(name) - saved = False - else: 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): """Helper function to save and block a module in sys.modules |