FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

merge with 3.3 · python/cpython@2909d6b · GitHub

Repository navigation

Commit 2909d6b

Browse files
committed
merge with 3.3
2 parents a81ef64 + 73b969e commit 2909d6b

4 files changed

Lines changed: 19 additions & 3 deletions

File tree

‎Lib/modulefinder.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import dis
44
import imp
5+
import importlib.machinery
56
import marshal
67
import os
78
import sys

‎Lib/test/test_modulefinder.py‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,18 @@ def foo(): pass
196196
from . import bar
197197
"""]
198198

199+
relative_import_test_4 = [
200+
"a.module",
201+
["a", "a.module"],
202+
[],
203+
[],
204+
"""\
205+
a/__init__.py
206+
def foo(): pass
207+
a/module.py
208+
from . import *
209+
"""]
210+
199211

200212
def open_file(path):
201213
dirname = os.path.dirname(path)
@@ -273,6 +285,9 @@ def test_relative_imports_2(self):
273285
def test_relative_imports_3(self):
274286
self._do_test(relative_import_test_3)
275287

288+
def test_relative_imports_4(self):
289+
self._do_test(relative_import_test_4)
290+
276291

277292
def test_main():
278293
support.run_unittest(ModuleFinderTest)

‎Misc/ACKS‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -901,15 +901,13 @@ William Park
901901
Harri Pasanen
902902
Gaël Pasgrimaud
903903
Ashish Nitin Patil
904-
Berker Peksag
905-
Bo Peng
906-
Joe Peterson
907904
Randy Pausch
908905
Samuele Pedroni
909906
Justin Peel
910907
Marcel van der Peijl
911908
Berker Peksag
912909
Steven Pemberton
910+
Bo Peng
913911
Santiago Peresón
914912
George Peristerakis
915913
Mathieu Perreault

‎Misc/NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ Core and Builtins
173173
Library
174174
-------
175175

176+
- Issue #16752: Add a missing import to modulefinder. Patch by Berker Peksag.
177+
176178
- Issue #16646: ftplib.FTP.makeport() might lose socket error details.
177179
(patch by Serhiy Storchaka)
178180

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL