# HG changeset patch # User Paul Boddie # Date 1341097447 -7200 # Node ID d7e91c9bc22899ae9b613550fb97e3c4dbf2f681 # Parent 3b6aafa2ca3341b03b9ba5ed4ef7844d3eb00586 Reinstated the loaded module test with an explanation of its purpose. diff -r 3b6aafa2ca33 -r d7e91c9bc228 micropython/__init__.py --- a/micropython/__init__.py Sun Jul 01 00:09:50 2012 +0200 +++ b/micropython/__init__.py Sun Jul 01 01:04:07 2012 +0200 @@ -970,8 +970,13 @@ else: name_for_return = name.split(".")[0] - if self.modules.has_key(name): - #print >>sys.stderr, "Cached (%s)" % name + # Loaded modules are returned immediately. + # Modules may be known but not yet loading (having been registered as + # submodules), loading, loaded, or completely unknown. + + if self.modules.has_key(name) and self.modules[name].loaded: + if self.verbose: + print >>sys.stderr, "Cached (%s)" % name return self.modules[name_for_return] if self.verbose: