From: Just van Rossum <just@letterror.com>
Date: Wed, 5 Mar 2003 17:23:48 +0000 (+0000)
Subject: Patch #698082 from Thomas Heller:  Modulefinder didn't exclude modules
X-Git-Tag: v2.3c1~1579
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0dfbaf4ef5fd4865d323666e9584ef7e76f9663;p=thirdparty%2FPython%2Fcpython.git

Patch #698082 from Thomas Heller:  Modulefinder didn't exclude modules
in packages correctly.
---

diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py
index f551a7653187..92ecbcb80ca4 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: