Merge for issue #17633

diff --cc Lib/test/test_zipimport.py
index 4f1953515d41e9f139e51d7f048e459b2579e2cd,0da5906f2833519615c53d5c097d2af3398cd908..1f10095f4383109bbf2a7ea799ddef5aa60f939d
--- 1/Lib/test/test_zipimport.py
--- 2/Lib/test/test_zipimport.py
+++ b/Lib/test/test_zipimport.py
@@@ -296,20 -471,10 +480,20 @@@ class UncompressedZipImportTestCase(Imp
              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)
-             mod = sys.modules[mod_name]
+             mod = importlib.import_module(mod_name)
+             self.assertTrue(mod_name in sys.modules)
              self.assertEqual(zi.get_source(TESTPACK2), None)
              self.assertEqual(zi.get_source(mod_path), None)
              self.assertEqual(zi.get_filename(mod_path), mod.__file__)

diff --cc Modules/zipimport.c
Simple merge