From f0dfbaf4ef5fd4865d323666e9584ef7e76f9663 Mon Sep 17 00:00:00 2001 From: Just van Rossum Date: Wed, 5 Mar 2003 17:23:48 +0000 Subject: [PATCH] Patch #698082 from Thomas Heller: Modulefinder didn't exclude modules in packages correctly. --- Lib/modulefinder.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py index f551a765318..92ecbcb80ca 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: