cpython: 1b9b7cb136db (original) (raw)
Mercurial > cpython
changeset 80984:1b9b7cb136db 3.3
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. [#16752]
| Brett Cannon brett@python.org | |
|---|---|
| date | Sat, 22 Dec 2012 19:34:21 -0500 |
| parents | ccc372b37fbb |
| children | d22e9e3a3326 e684b253fd9d |
| files | Lib/modulefinder.py Lib/test/test_modulefinder.py Misc/ACKS Misc/NEWS |
| diffstat | 4 files changed, 19 insertions(+), 3 deletions(-)[+] [-] Lib/modulefinder.py 1 Lib/test/test_modulefinder.py 15 Misc/ACKS 4 Misc/NEWS 2 |
line wrap: on
line diff
--- 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
--- 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 = [
def foo(): pass[](#l2.14)
from . import *[](#l2.16)
+"""] + 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_main(): support.run_unittest(ModuleFinderTest)
--- 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
--- 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. +