Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
eb65ea95
Commit
eb65ea95
authored
Apr 14, 2013
by
Nick Coghlan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Close issue #16163: handle submodules in pkgutil.iter_importers
parent
3bfa8215
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
44 additions
and
2 deletions
+44
-2
Lib/pkgutil.py
Lib/pkgutil.py
+2
-2
Lib/test/test_pkgutil.py
Lib/test/test_pkgutil.py
+39
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/pkgutil.py
View file @
eb65ea95
...
...
@@ -451,8 +451,8 @@ def iter_importers(fullname=""):
if
'.'
in
fullname
:
# Get the containing package's __path__
pkg_name
=
fullname
.
rpartition
(
"."
)[
0
]
pkg
=
importlib
.
import_module
(
pkg
)
path
=
getattr
(
sys
.
modules
[
pkg
]
,
'__path__'
,
None
)
pkg
=
importlib
.
import_module
(
pkg
_name
)
path
=
getattr
(
pkg
,
'__path__'
,
None
)
if
path
is
None
:
return
else
:
...
...
Lib/test/test_pkgutil.py
View file @
eb65ea95
...
...
@@ -2,6 +2,7 @@ from test.support import run_unittest, unload, check_warnings
import
unittest
import
sys
import
imp
import
importlib
import
pkgutil
import
os
import
os.path
...
...
@@ -187,6 +188,44 @@ class ExtendPathTests(unittest.TestCase):
del
sys
.
modules
[
'foo.bar'
]
del
sys
.
modules
[
'foo.baz'
]
# Another awful testing hack to be cleaned up once the test_runpy
# helpers are factored out to a common location
def
test_iter_importers
(
self
):
iter_importers
=
pkgutil
.
iter_importers
get_importer
=
pkgutil
.
get_importer
pkgname
=
'spam'
modname
=
'eggs'
dirname
=
self
.
create_init
(
pkgname
)
pathitem
=
os
.
path
.
join
(
dirname
,
pkgname
)
fullname
=
'{}.{}'
.
format
(
pkgname
,
modname
)
try
:
self
.
create_submodule
(
dirname
,
pkgname
,
modname
,
0
)
importlib
.
import_module
(
fullname
)
importers
=
list
(
iter_importers
(
fullname
))
expected_importer
=
get_importer
(
pathitem
)
for
finder
in
importers
:
self
.
assertIsInstance
(
finder
,
importlib
.
machinery
.
FileFinder
)
self
.
assertEqual
(
finder
,
expected_importer
)
self
.
assertIsInstance
(
finder
.
find_module
(
fullname
),
importlib
.
machinery
.
SourceFileLoader
)
self
.
assertIsNone
(
finder
.
find_module
(
pkgname
))
with
self
.
assertRaises
(
ImportError
):
list
(
iter_importers
(
'invalid.module'
))
with
self
.
assertRaises
(
ImportError
):
list
(
iter_importers
(
'.spam'
))
finally
:
shutil
.
rmtree
(
dirname
)
del
sys
.
path
[
0
]
del
sys
.
modules
[
'spam'
]
del
sys
.
modules
[
'spam.eggs'
]
def
test_mixed_namespace
(
self
):
pkgname
=
'foo'
dirname_0
=
self
.
create_init
(
pkgname
)
...
...
Misc/NEWS
View file @
eb65ea95
...
...
@@ -29,6 +29,9 @@ Core and Builtins
Library
-------
-
Issue
#
16163
:
Make
the
importlib
based
version
of
pkgutil
.
iter_importers
work
for
submodules
.
Initial
patch
by
Berker
Peksag
.
-
Issue
#
16804
:
Fix
a
bug
in
the
'site'
module
that
caused
running
'python -S -m site'
to
incorrectly
throw
an
exception
.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment