Merge heads.

2013-11-22 13:55:59 -07:00 · 2013-11-22 13:55:59 -07:00 · 2f66ffa652
parent 7a4e2d1751 2ba66ebc20
commit 2f66ffa652
1 changed files with 2 additions and 0 deletions
--- 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)