From: Brett Cannon <brett@python.org>
Date: Sun, 23 Dec 2012 00:34:21 +0000 (-0500)
Subject: Issue #16752: Add a missing import to modulefinder.
X-Git-Tag: v3.3.1rc1~496
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=73b969ec70ff4d422bff34d63cfb220cfac96779;p=thirdparty%2FPython%2Fcpython.git

Issue #16752: Add a missing import to modulefinder.

Also fix Misc/ACKS to put part of it back in alphabetical order and
remove some duplicate names.

Patch by Berker Peksag.
---

diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py
index 683e30549643..f90a4327e670 100644
--- a/Lib/modulefinder.py
+++ b/Lib/modulefinder.py
@@ -2,6 +2,7 @@
 
 import dis
 import imp
+import importlib.machinery
 import marshal
 import os
 import sys
diff --git a/Lib/test/test_modulefinder.py b/Lib/test/test_modulefinder.py
index c5fc320f6450..53ea23217491 100644
--- a/Lib/test/test_modulefinder.py
+++ b/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)
diff --git a/Misc/ACKS b/Misc/ACKS
index a5351b386e5b..e4d178355af7 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -894,15 +894,13 @@ Dan Parisien
 William Park
 Harri Pasanen
 Gaël Pasgrimaud
-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
diff --git a/Misc/NEWS b/Misc/NEWS
index 7e041f37b3f9..97e24fa1db9c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -114,6 +114,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)