summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_importlib
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2013-05-30 21:31:47 (GMT)
committerBrett Cannon <brett@python.org>2013-05-30 21:31:47 (GMT)
commit357c9fb0556e0ec9d440a4874b6af19d7b0bee7b (patch)
tree9eaf7e79f980770c75961a06ce92a8f647b10dad /Lib/test/test_importlib
parent335ab5b66f432ae3713840ed2403a11c368f5406 (diff)
downloadcpython-357c9fb0556e0ec9d440a4874b6af19d7b0bee7b.zip
cpython-357c9fb0556e0ec9d440a4874b6af19d7b0bee7b.tar.gz
cpython-357c9fb0556e0ec9d440a4874b6af19d7b0bee7b.tar.bz2
Rename importlib.util.ModuleManager to module_to_load so that the name
explains better what the context manager is providing.
Diffstat (limited to 'Lib/test/test_importlib')
-rw-r--r--Lib/test/test_importlib/test_util.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/Lib/test/test_importlib/test_util.py b/Lib/test/test_importlib/test_util.py
index b3896f8..7646b34 100644
--- a/Lib/test/test_importlib/test_util.py
+++ b/Lib/test/test_importlib/test_util.py
@@ -7,7 +7,7 @@ import types
import unittest
-class ModuleManagerTests(unittest.TestCase):
+class ModuleToLoadTests(unittest.TestCase):
module_name = 'ModuleManagerTest_module'
@@ -19,7 +19,7 @@ class ModuleManagerTests(unittest.TestCase):
# Test a new module is created, inserted into sys.modules, has
# __initializing__ set to True after entering the context manager,
# and __initializing__ set to False after exiting.
- with util.ModuleManager(self.module_name) as module:
+ with util.module_to_load(self.module_name) as module:
self.assertIn(self.module_name, sys.modules)
self.assertIs(sys.modules[self.module_name], module)
self.assertTrue(module.__initializing__)
@@ -28,19 +28,19 @@ class ModuleManagerTests(unittest.TestCase):
def test_new_module_failed(self):
# Test the module is removed from sys.modules.
try:
- with util.ModuleManager(self.module_name) as module:
+ with util.module_to_load(self.module_name) as module:
self.assertIn(self.module_name, sys.modules)
raise exception
except Exception:
self.assertNotIn(self.module_name, sys.modules)
else:
- self.fail('importlib.util.ModuleManager swallowed an exception')
+ self.fail('importlib.util.module_to_load swallowed an exception')
def test_reload(self):
# Test that the same module is in sys.modules.
created_module = imp.new_module(self.module_name)
sys.modules[self.module_name] = created_module
- with util.ModuleManager(self.module_name) as module:
+ with util.module_to_load(self.module_name) as module:
self.assertIs(module, created_module)
def test_reload_failed(self):
@@ -48,12 +48,12 @@ class ModuleManagerTests(unittest.TestCase):
created_module = imp.new_module(self.module_name)
sys.modules[self.module_name] = created_module
try:
- with util.ModuleManager(self.module_name) as module:
+ with util.module_to_load(self.module_name) as module:
raise Exception
except Exception:
self.assertIn(self.module_name, sys.modules)
else:
- self.fail('importlib.util.ModuleManager swallowed an exception')
+ self.fail('importlib.util.module_to_load swallowed an exception')
class ModuleForLoaderTests(unittest.TestCase):