1.1 --- a/micropython/__init__.py Sun Jul 01 00:09:50 2012 +0200
1.2 +++ b/micropython/__init__.py Sun Jul 01 01:04:07 2012 +0200
1.3 @@ -970,8 +970,13 @@
1.4 else:
1.5 name_for_return = name.split(".")[0]
1.6
1.7 - if self.modules.has_key(name):
1.8 - #print >>sys.stderr, "Cached (%s)" % name
1.9 + # Loaded modules are returned immediately.
1.10 + # Modules may be known but not yet loading (having been registered as
1.11 + # submodules), loading, loaded, or completely unknown.
1.12 +
1.13 + if self.modules.has_key(name) and self.modules[name].loaded:
1.14 + if self.verbose:
1.15 + print >>sys.stderr, "Cached (%s)" % name
1.16 return self.modules[name_for_return]
1.17
1.18 if self.verbose: