traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch #698082 from Thomas Heller: Modulefinder didn't exclude modules 

in packages correctly.
This commit is contained in:
Just van Rossum 2003-03-05 17:23:48 +00:00
parent 62442c295a
commit f0dfbaf4ef
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/modulefinder.py
View File

@ -242,7 +242,7 @@ class ModuleFinder:
return None
try:
fp, pathname, stuff = self.find_module(partname,
parent and parent.__path__)
parent and parent.__path__, parent)
except ImportError:
self.msgout(3, "import_module ->", None)
return None
@ -385,9 +385,9 @@ class ModuleFinder:
self.modules[fqname] = m = Module(fqname)
return m
def find_module(self, name, path):
if path:
fullname = '.'.join(path)+'.'+name
def find_module(self, name, path, parent=None):
if parent is not None:
fullname = parent.__name__+'.'+name
else:
fullname = name
if fullname in self.excludes: