Kaydet (Commit) 8ff52764 authored tarafından Just van Rossum's avatar Just van Rossum

- changed the API of process() so it will return a list of missing modules…

- changed the API of process() so it will return a list of missing modules instead of raising an exception.
- minor cleanups
(jvr)
üst 5dbf526e
...@@ -48,8 +48,12 @@ class ModuleFinder(modulefinder.ModuleFinder): ...@@ -48,8 +48,12 @@ class ModuleFinder(modulefinder.ModuleFinder):
self.modules[fqname] = m = Module(fqname) self.modules[fqname] = m = Module(fqname)
return m return m
def process(program, modules=[], module_files = [], debug=0): def process(program, modules=None, module_files=None, debug=0):
error = [] if modules is None:
modules = []
if module_files is None:
module_files = []
missing = []
# #
# Add the standard modules needed for startup # Add the standard modules needed for startup
# #
...@@ -89,7 +93,7 @@ def process(program, modules=[], module_files = [], debug=0): ...@@ -89,7 +93,7 @@ def process(program, modules=[], module_files = [], debug=0):
if not m in maymiss: if not m in maymiss:
if debug > 0: if debug > 0:
print 'Missing', m print 'Missing', m
error.append(m) missing.append(m)
# #
# Warn the user about unused builtins # Warn the user about unused builtins
# #
...@@ -103,6 +107,4 @@ def process(program, modules=[], module_files = [], debug=0): ...@@ -103,6 +107,4 @@ def process(program, modules=[], module_files = [], debug=0):
# XXXX Can this happen? # XXXX Can this happen?
if debug > 0: if debug > 0:
print 'Conflict', m print 'Conflict', m
if error: return module_dict, missing
raise Missing, error
return module_dict
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