Commits

Thomas Heller committed 17bf95e

Fix SF item #876278: Unbounded recursion in modulefinder.

Comments (0)

Files changed (2)

Lib/modulefinder.py

         if self.badmodules.has_key(fqname):
             self.msgout(3, "import_module -> None")
             return None
+        if parent and parent.__path__ is None:
+            self.msgout(3, "import_module -> None")
+            return None
         try:
             fp, pathname, stuff = self.find_module(partname,
                                                    parent and parent.__path__, parent)
 
     def find_module(self, name, path, parent=None):
         if parent is not None:
+            # assert path is not None
             fullname = parent.__name__+'.'+name
         else:
             fullname = name
 Library
 -------
 
+- Bug #876278: Unbounded recursion in modulefinder
+
 - Brought platform.py in line with the 2.4 version, fixing support for
   newer Windows versions and a cache issue.