Commit 03f7a703 authored by Fred Drake's avatar Fred Drake

Nick Mathewson: Make sure the recursion is handled properly.

This is part of SF patch #440292.
parent 6943a29c
......@@ -166,8 +166,8 @@ def readmodule_ex(module, path=[], inpackage=0):
# Dotted module name
package = module[:i].strip()
submodule = module[i+1:].strip()
parent = readmodule(package, path, inpackage)
child = readmodule(submodule, parent['__path__'], 1)
parent = readmodule_ex(package, path, inpackage)
child = readmodule_ex(submodule, parent['__path__'], 1)
return child
if _modules.has_key(module):
......@@ -295,7 +295,7 @@ def readmodule_ex(module, path=[], inpackage=0):
n = n.strip()
try:
# recursively read the imported module
d = readmodule(n, path, inpackage)
d = readmodule_ex(n, path, inpackage)
except:
##print 'module', n, 'not found'
pass
......@@ -306,7 +306,7 @@ def readmodule_ex(module, path=[], inpackage=0):
names = m.group("ImportFromList").split(',')
try:
# recursively read the imported module
d = readmodule(mod, path, inpackage)
d = readmodule_ex(mod, path, inpackage)
except:
##print 'module', mod, 'not found'
continue
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment