mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-24 02:15:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sjoerd Mullender:

Browse Source 
When printing missing modules, also print the module they were
imported from.
This commit is contained in:
Guido van Rossum 1998-12-15 15:35:23 +00:00
parent 9c1696cff5
commit 38b92eb56a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tools/freeze/hello.py
View File

@ -1 +1,2 @@
print 'Hello world...'
import fooblurg

9
Tools/freeze/modulefinder.py
View File

@ -220,6 +220,7 @@ class ModuleFinder:
return m
if self.badmodules.has_key(fqname):
self.msgout(3, "import_module -> None")
self.badmodules[fqname][parent.__name__] = None
return None
try:
fp, pathname, stuff = self.find_module(partname,
@ -279,7 +280,7 @@ class ModuleFinder:
self.import_hook(name, m)
except ImportError, msg:
self.msg(2, "ImportError:", str(msg))
self.badmodules[name] = None
self.badmodules[name] = {m.__name__:None}
elif op == IMPORT_FROM:
name = co.co_names[oparg]
assert lastname is not None
@ -289,7 +290,7 @@ class ModuleFinder:
except ImportError, msg:
self.msg(2, "ImportError:", str(msg))
fullname = lastname + "." + name
self.badmodules[fullname] = None
self.badmodules[fullname] = {m.__name__:None}
else:
lastname = None
for c in co.co_consts:
@ -361,7 +362,9 @@ class ModuleFinder:
for key in keys:
# ... but not if they were explicitely excluded.
if key not in self.excludes:
print "?", key
mods = self.badmodules[key].keys()
mods.sort()
print "?", key, "from", string.join(mods, ', ')
def test():