Merge heads.

2b346621 · Eric Snow · 82514a45 · 8611addb · 2b346621
Commit 2b346621 authored Nov 22, 2013 by Eric Snow
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

Lib/test/test_pkgutil.py Lib/test/test_pkgutil.py +2 -0

No files found.
--- 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)