Merge heads.

ericsnowcurrently · ericsnowcurrently · commit 2f66ffa652e1 · 2013-11-22T13:55:59.000-07:00
diff --git a/Lib/test/test_pkgutil.py b/Lib/test/test_pkgutil.py
@@ -200,6 +200,8 @@ def test_iter_importers(self):
         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)
 
