# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1473453611 -7200
# Node ID 4a2c0bd37c0bba1af4d66b333b842f78dd0803d6
# Parent  65c5413aa746e4fa7667f57d4ce730783958e0c3
Only define modules as objects if not replaced.

diff -r 65c5413aa746 -r 4a2c0bd37c0b importer.py
--- a/importer.py	Fri Sep 09 22:08:50 2016 +0200
+++ b/importer.py	Fri Sep 09 22:40:11 2016 +0200
@@ -755,6 +755,11 @@
             print >>sys.stderr, module_name in self.required and "Required" or "Loading", module_name, "from", filename
         fn(module)(filename)
 
+        # Add the module object if not already defined.
+
+        if not self.objects.has_key(module_name):
+            self.objects[module_name] = Reference("<module>", module_name)
+
     def add_module(self, module_name, module):
 
         """
@@ -763,7 +768,6 @@
         """
 
         self.modules[module_name] = module
-        self.objects[module_name] = Reference("<module>", module_name)
         if module_name in self.to_import:
             self.to_import.remove(module_name)