Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Kirill Smelkov
cpython
Commits
280e9f7c
Commit
280e9f7c
authored
12 years ago
by
Petri Lehtinen
Browse files
Options
Download
Email Patches
Plain Diff
#14798: pyclbr now raises ImportError instead of KeyError for missing packages
parent
491ef97f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
0 deletions
+12
-0
Lib/pyclbr.py
Lib/pyclbr.py
+2
-0
Lib/test/test_pyclbr.py
Lib/test/test_pyclbr.py
+5
-0
Misc/ACKS
Misc/ACKS
+1
-0
Misc/NEWS
Misc/NEWS
+4
-0
No files found.
Lib/pyclbr.py
View file @
280e9f7c
...
...
@@ -128,6 +128,8 @@ def _readmodule(module, path, inpackage=None):
parent
=
_readmodule
(
package
,
path
,
inpackage
)
if
inpackage
is
not
None
:
package
=
"%s.%s"
%
(
inpackage
,
package
)
if
not
'__path__'
in
parent
:
raise
ImportError
(
'No package named {}'
.
format
(
package
))
return
_readmodule
(
submodule
,
parent
[
'__path__'
],
package
)
# Search the path for the module
...
...
This diff is collapsed.
Click to expand it.
Lib/test/test_pyclbr.py
View file @
280e9f7c
...
...
@@ -188,6 +188,11 @@ class PyclbrTest(TestCase):
cm
(
'email.parser'
)
cm
(
'test.test_pyclbr'
)
def
test_issue_14798
(
self
):
# test ImportError is raised when the first part of a dotted name is
# not a package
self
.
assertRaises
(
ImportError
,
pyclbr
.
readmodule_ex
,
'asyncore.foo'
)
def
test_main
():
run_unittest
(
PyclbrTest
)
...
...
This diff is collapsed.
Click to expand it.
Misc/ACKS
View file @
280e9f7c
...
...
@@ -297,6 +297,7 @@ Lars Marius Garshol
Dan Gass
Andrew Gaul
Stephen M. Gava
Xavier de Gaye
Harry Henry Gebel
Marius Gedminas
Thomas Gellekum
...
...
This diff is collapsed.
Click to expand it.
Misc/NEWS
View file @
280e9f7c
...
...
@@ -60,6 +60,10 @@ Core and Builtins
Library
-------
-
Issue
#
14798
:
Fix
the
functions
in
pyclbr
to
raise
an
ImportError
when
the
first
part
of
a
dotted
name
is
not
a
package
.
Patch
by
Xavier
de
Gaye
.
-
Issue
#
14832
:
fixed
the
order
of
the
argument
references
in
the
error
message
produced
by
unittest
's assertItemsEqual.
...
...
This diff is collapsed.
Click to expand it.
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