Skip to content

Fix nested namespace package import causing import-error #460

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
merged 1 commit into from
Apr 2, 2018
Merged

Fix nested namespace package import causing import-error #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion astroid/interpreter/_import/spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ class ExplicitNamespacePackageFinder(ImpFinder):

def find_module(self, modname, module_parts, processed, submodule_path):
if processed:
return None
modname = '.'.join(processed + [modname])
if util.is_namespace(modname) and modname in sys.modules:
submodule_path = sys.modules[modname].__path__
return ModuleSpec(name=modname, location='',
Expand Down
1 change: 1 addition & 0 deletions astroid/tests/testdata/python2/data/foogle_fax-0.12.5-py2.7-nspkg.pth
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
import sys, types, os;p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('foogle',));ie = os.path.exists(os.path.join(p,'__init__.py'));m = not ie and sys.modules.setdefault('foogle', types.ModuleType('foogle'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p)
import sys, types, os;p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('foogle','crank'));ie = os.path.exists(os.path.join(p,'__init__.py'));m = not ie and sys.modules.setdefault('foogle.crank', types.ModuleType('foogle.crank'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p)
1 change: 1 addition & 0 deletions astroid/tests/testdata/python3/data/foogle_fax-0.12.5-py2.7-nspkg.pth
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
import sys, types, os;p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('foogle',));ie = os.path.exists(os.path.join(p,'__init__.py'));m = not ie and sys.modules.setdefault('foogle', types.ModuleType('foogle'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p)
import sys, types, os;p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('foogle','crank'));ie = os.path.exists(os.path.join(p,'__init__.py'));m = not ie and sys.modules.setdefault('foogle.crank', types.ModuleType('foogle.crank'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p)
11 changes: 11 additions & 0 deletions astroid/tests/unittest_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,17 @@ def test_namespace_package_pth_support(self):
del pkg_resources._namespace_packages['foogle'] # pylint: disable=no-member
sys.modules.pop('foogle')

def test_nested_namespace_import(self):
pth = 'foogle_fax-0.12.5-py2.7-nspkg.pth'
site.addpackage(resources.RESOURCE_PATH, pth, [])
pkg_resources._namespace_packages['foogle'] = ['foogle.crank'] # pylint: disable=no-member
pkg_resources._namespace_packages['foogle.crank'] = [] # pylint: disable=no-member
try:
self.manager.ast_from_module_name('foogle.crank')
finally:
del pkg_resources._namespace_packages['foogle'] # pylint: disable=no-member
sys.modules.pop('foogle')

def test_namespace_and_file_mismatch(self):
filepath = unittest.__file__
ast = self.manager.ast_from_file(filepath)
Expand Down