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 683e305..f90a432 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 c5fc320..53ea232 100644
--- a/Lib/test/test_modulefinder.py
+++ b/Lib/test/test_modulefinder.py
@@ -196,6 +196,18 @@
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 @@
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 a5351b3..e4d1783 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -894,15 +894,13 @@
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 7e041f3..97e24fa 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -114,6 +114,8 @@
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)