Skip to content

bpo-36298: Raise ModuleNotFoundError in pyclbr when a module can't be found #12358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 4 commits into from
Mar 22, 2019
Merged

bpo-36298: Raise ModuleNotFoundError in pyclbr when a module can't be found #12358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bed13fb
Explicitly check if an attribute on a spec exists
brettcannon Mar 15, 2019
d871514
Test against a non-existent module
brettcannon Mar 15, 2019
9c52322
Be more accurate about the exception raised
brettcannon Mar 15, 2019
56293ad
Revert a change because the spec is expected to be fully-conforming
brettcannon Mar 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Lib/pyclbr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,17 +160,20 @@ def _readmodule(module, path, inpackage=None):
else:
search_path = path + sys.path
spec = importlib.util._find_spec_from_path(fullmodule, search_path)
if spec is None:
raise ModuleNotFoundError(f"no module named {fullmodule!r}", name=fullmodule)
Comment thread
brettcannon marked this conversation as resolved.
_modules[fullmodule] = tree
# Is module a package?
if spec.submodule_search_locations is not None:
tree['__path__'] = spec.submodule_search_locations
try:
source = spec.loader.get_source(fullmodule)
if source is None:
return tree
except (AttributeError, ImportError):
# If module is not Python source, we cannot do anything.
return tree
else:
if source is None:
return tree
Comment thread
brettcannon marked this conversation as resolved.

fname = spec.loader.get_filename(fullmodule)
return _create_tree(fullmodule, path, fname, source, tree, inpackage)
Expand Down
24 changes: 22 additions & 2 deletions Lib/test/test_pyclbr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import pyclbr
from unittest import TestCase, main as unittest_main
from test import support
from test.test_importlib import util as test_importlib_util
from functools import partial

StaticMethodType = type(staticmethod(lambda: None))
Expand Down Expand Up @@ -235,11 +236,30 @@ def test_others(self):
cm('email.parser')
cm('test.test_pyclbr')

def test_issue_14798(self):

class ReadmoduleTests(TestCase):

def setUp(self):
self._modules = pyclbr._modules.copy()

def tearDown(self):
pyclbr._modules = self._modules


def test_dotted_name_not_a_package(self):
# test ImportError is raised when the first part of a dotted name is
# not a package
# not a package.
#
# Issue #14798.
self.assertRaises(ImportError, pyclbr.readmodule_ex, 'asyncore.foo')

def test_module_has_no_spec(self):
module_name = "doesnotexist"
assert module_name not in pyclbr._modules
with test_importlib_util.uncache(module_name):
with self.assertRaises(ModuleNotFoundError):
pyclbr.readmodule_ex(module_name)


if __name__ == "__main__":
unittest_main()
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2019-03-15-13-54-07.bpo-36298.amEVK2.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Raise ModuleNotFoundError in pyclbr when a module can't be found.
Thanks to 'mental' for the bug report.