summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-04-06 17:20:25 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-04-06 17:20:25 (GMT)
commit049208635d4bb55f757de7f599f73902748c8257 (patch)
treebf7cf4462061474ec00a8f5c9305514ed3fba383
parent161aece9d3574c22d2585687db5cd4f33a76f052 (diff)
parentd62cd5627fc5c01571c018b8a11b152614862eff (diff)
downloadcpython-049208635d4bb55f757de7f599f73902748c8257.zip
cpython-049208635d4bb55f757de7f599f73902748c8257.tar.gz
cpython-049208635d4bb55f757de7f599f73902748c8257.tar.bz2
merge heads
-rw-r--r--Lib/importlib/test/import_/test_packages.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/Lib/importlib/test/import_/test_packages.py b/Lib/importlib/test/import_/test_packages.py
index 9590d5f..58be433 100644
--- a/Lib/importlib/test/import_/test_packages.py
+++ b/Lib/importlib/test/import_/test_packages.py
@@ -3,6 +3,7 @@ from . import util as import_util
import sys
import unittest
import importlib
+from test import support
class ParentModuleTests(unittest.TestCase):
@@ -38,7 +39,10 @@ class ParentModuleTests(unittest.TestCase):
module_code={'mod': module_injection})
with mock_modules as mock:
with util.import_state(meta_path=[mock]):
- submodule = import_util.import_(subname)
+ try:
+ submodule = import_util.import_(subname)
+ finally:
+ support.unload(subname)
def test_main():