summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Snow <ericsnowcurrently@gmail.com>2013-11-22 20:55:59 (GMT)
committerEric Snow <ericsnowcurrently@gmail.com>2013-11-22 20:55:59 (GMT)
commit2f66ffa652e1695d39b6c9ba42c9b97da7a7f962 (patch)
treeaf69d576bab91d58998949a2a33a510d99ad8e77
parent7a4e2d1751e7b261cd13685d488504e6d5a7ebee (diff)
parent2ba66ebc20347671082094aac538f13e1fa1fcca (diff)
downloadcpython-2f66ffa652e1695d39b6c9ba42c9b97da7a7f962.zip
cpython-2f66ffa652e1695d39b6c9ba42c9b97da7a7f962.tar.gz
cpython-2f66ffa652e1695d39b6c9ba42c9b97da7a7f962.tar.bz2
Merge heads.
-rw-r--r--Lib/test/test_pkgutil.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/test_pkgutil.py b/Lib/test/test_pkgutil.py
index 52dd0bc..d73b211 100644
--- a/Lib/test/test_pkgutil.py
+++ b/Lib/test/test_pkgutil.py
@@ -200,6 +200,8 @@ class ExtendPathTests(unittest.TestCase):
dirname = self.create_init(pkgname)
pathitem = os.path.join(dirname, pkgname)
fullname = '{}.{}'.format(pkgname, modname)
+ sys.modules.pop(fullname, None)
+ sys.modules.pop(pkgname, None)
try:
self.create_submodule(dirname, pkgname, modname, 0)