[Python-checkins] cpython (merge default -> default): Merge heads.

[eric.snow]

http://hg.python.org/cpython/rev/64ff3457010c
changeset:   87373:64ff3457010c
parent:      87371:cce14bc9b675
parent:      87372:59f3e50061bd
user:        Eric Snow <ericsnowcurrently at gmail.com>
date:        Fri Nov 22 13:55:59 2013 -0700
summary:
  Merge heads.

files:
  Lib/test/test_pkgutil.py |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_pkgutil.py b/Lib/test/test_pkgutil.py
--- a/Lib/test/test_pkgutil.py
+++ b/Lib/test/test_pkgutil.py
@@ -200,6 +200,8 @@
         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)
 

-- 
Repository URL: http://hg.python.org/cpython