merge with 3.3

Lib/modulefinder.py

@@ -2,6 +2,7 @@
 
 import dis
 import imp
+import importlib.machinery
 import marshal
 import os
 import sys

Lib/test/test_modulefinder.py

@@ -196,6 +196,18 @@ a/module.py
                                 from . import bar
 """]
 
+relative_import_test_4 = [
+    "a.module",
+    ["a", "a.module"],
+    [],
+    [],
+    """\
+a/__init__.py
+                                def foo(): pass
+a/module.py
+                                from . import *
+"""]
+
 
 def open_file(path):
     dirname = os.path.dirname(path)
@@ -273,6 +285,9 @@ class ModuleFinderTest(unittest.TestCase):
     def test_relative_imports_3(self):
         self._do_test(relative_import_test_3)
 
+    def test_relative_imports_4(self):
+        self._do_test(relative_import_test_4)
+
 
 def test_main():
     support.run_unittest(ModuleFinderTest)

Misc/ACKS

@@ -901,15 +901,13 @@ William Park
 Harri Pasanen
 Gaël Pasgrimaud
 Ashish Nitin Patil
-Berker Peksag
-Bo Peng
-Joe Peterson
 Randy Pausch
 Samuele Pedroni
 Justin Peel
 Marcel van der Peijl
 Berker Peksag
 Steven Pemberton
+Bo Peng
 Santiago Peresón
 George Peristerakis
 Mathieu Perreault

Misc/NEWS

@@ -173,6 +173,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #16752: Add a missing import to modulefinder. Patch by Berker Peksag.
+
 - Issue #16646: ftplib.FTP.makeport() might lose socket error details.
   (patch by Serhiy Storchaka)