changeset:   96998:ef5c5a2bbd48
user:        Robert Collins <rbtcollins@hp.com>
date:        Thu Jul 23 02:57:56 2015 +1200
files:       Lib/test/test_zipimport.py Misc/NEWS
description:
Issue #8585: improved tests for zipimporter2. Patch from Mark Lawrence.


diff -r 6f4e0c462daf -r ef5c5a2bbd48 Lib/test/test_zipimport.py
--- a/Lib/test/test_zipimport.py	Wed Jul 22 14:49:13 2015 +0300
+++ b/Lib/test/test_zipimport.py	Thu Jul 23 02:57:56 2015 +1200
@@ -214,7 +214,8 @@
         packdir2 = packdir + TESTPACK2 + os.sep
         files = {packdir + "__init__" + pyc_ext: (NOW, test_pyc),
                  packdir2 + "__init__" + pyc_ext: (NOW, test_pyc),
-                 packdir2 + TESTMOD + pyc_ext: (NOW, test_pyc)}
+                 packdir2 + TESTMOD + pyc_ext: (NOW, test_pyc),
+                 "spam" + pyc_ext: (NOW, test_pyc)}
 
         z = ZipFile(TEMP_ZIP, "w")
         try:
@@ -228,6 +229,14 @@
             zi = zipimport.zipimporter(TEMP_ZIP)
             self.assertEqual(zi.archive, TEMP_ZIP)
             self.assertEqual(zi.is_package(TESTPACK), True)
+
+            find_mod = zi.find_module('spam')
+            self.assertIsNotNone(find_mod)
+            self.assertIsInstance(find_mod, zipimport.zipimporter)
+            self.assertFalse(find_mod.is_package('spam'))
+            load_mod = find_mod.load_module('spam')
+            self.assertEqual(find_mod.get_filename('spam'), load_mod.__file__)
+
             mod = zi.load_module(TESTPACK)
             self.assertEqual(zi.get_filename(TESTPACK), mod.__file__)
 
@@ -287,6 +296,16 @@
             self.assertEqual(
                 zi.is_package(TESTPACK2 + os.sep + TESTMOD), False)
 
+            pkg_path = TEMP_ZIP + os.sep + packdir + TESTPACK2
+            zi2 = zipimport.zipimporter(pkg_path)
+            find_mod_dotted = zi2.find_module(TESTMOD)
+            self.assertIsNotNone(find_mod_dotted)
+            self.assertIsInstance(find_mod_dotted, zipimport.zipimporter)
+            self.assertFalse(zi2.is_package(TESTMOD))
+            load_mod = find_mod_dotted.load_module(TESTMOD)
+            self.assertEqual(
+                find_mod_dotted.get_filename(TESTMOD), load_mod.__file__)
+
             mod_path = TESTPACK2 + os.sep + TESTMOD
             mod_name = module_path_to_dotted_name(mod_path)
             __import__(mod_name)
diff -r 6f4e0c462daf -r ef5c5a2bbd48 Misc/NEWS
--- a/Misc/NEWS	Wed Jul 22 14:49:13 2015 +0300
+++ b/Misc/NEWS	Thu Jul 23 02:57:56 2015 +1200
@@ -13,6 +13,8 @@
 Library
 -------
 
+- Issue #8585: improved tests for zipimporter2. Patch from Mark Lawrence.
+
 - Issue #18622: unittest.mock.mock_open().reset_mock would recurse infinitely.
   Patch from Nicola Palumbo and Laurent De Buyst.