diff options
| author | Just van Rossum <just@letterror.com> | 2003-03-05 17:23:48 (GMT) |
|---|---|---|
| committer | Just van Rossum <just@letterror.com> | 2003-03-05 17:23:48 (GMT) |
| commit | f0dfbaf4ef5fd4865d323666e9584ef7e76f9663 (patch) | |
| tree | 03d838546a2564381914424a851e72f616f8ccb2 /Lib | |
| parent | 62442c295af58c0d98825cf3ab9a1ea3ea0ea438 (diff) | |
| download | cpython-f0dfbaf4ef5fd4865d323666e9584ef7e76f9663.zip cpython-f0dfbaf4ef5fd4865d323666e9584ef7e76f9663.tar.gz cpython-f0dfbaf4ef5fd4865d323666e9584ef7e76f9663.tar.bz2 | |
Patch #698082 from Thomas Heller: Modulefinder didn't exclude modules
in packages correctly.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/modulefinder.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py index f551a76..92ecbcb 100644 --- a/Lib/modulefinder.py +++ b/Lib/modulefinder.py @@ -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: |