mirror of
https://github.com/python/cpython.git
synced 2025-11-25 21:11:09 +00:00
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.
This commit is contained in:
parent
f03eee12b4
commit
73b969ec70
4 changed files with 19 additions and 3 deletions
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
import dis
|
||||
import imp
|
||||
import importlib.machinery
|
||||
import marshal
|
||||
import os
|
||||
import sys
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue