[Python-checkins] python/dist/src/Lib modulefinder.py, 1.7.6.1,
1.7.6.2
theller at users.sourceforge.net
theller at users.sourceforge.net
Tue May 11 10:59:48 EDT 2004
Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15607
Modified Files:
Tag: release23-maint
modulefinder.py
Log Message:
Fix SF item #876278: Unbounded recursion in modulefinder.
Index: modulefinder.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/modulefinder.py,v
retrieving revision 1.7.6.1
retrieving revision 1.7.6.2
diff -C2 -d -r1.7.6.1 -r1.7.6.2
*** modulefinder.py 14 Nov 2003 10:23:03 -0000 1.7.6.1
--- modulefinder.py 11 May 2004 14:59:45 -0000 1.7.6.2
***************
*** 246,249 ****
--- 246,252 ----
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,
***************
*** 393,396 ****
--- 396,400 ----
def find_module(self, name, path, parent=None):
if parent is not None:
+ # assert path is not None
fullname = parent.__name__+'.'+name
else:
More information about the Python-checkins
mailing list