Ticket #8413: 8413.patch

django/utils/autoreload.py

@@ -27 +27 @@
 # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+from ihooks import ModuleImporter, ModuleLoader
+import ihooks
 
-import os, sys, time
-
+import os, sys, time, imp
 try:
     import thread
 except ImportError:
@@ -42 +43 @@
 except ImportError:
     pass
 
+try:
+    set
+except NameError:
+    from sets import Set as set     # For Python 2.3
 
 RUN_RELOADER = True
 
 _mtimes = {}
 _win = (sys.platform == "win32")
 
+class ModuleLoaderHook(ModuleLoader):
+    __caught = set()
+    def __init__(self, hooks = None, verbose = False):
+        ModuleLoader.__init__(self, hooks, verbose)
+        before = filter(lambda v: v, map(lambda m: getattr(m, "__file__", None), sys.modules.values()))
+        for filename in before:
+            self.note('Already loaded %s', filename)
+        ModuleLoaderHook.__caught = set(before) 
+    
+    def tracked(self):
+        return list(self.__caught)
+
+    def load_module(self, name, stuff):
+        file, filename, info = stuff
+        if filename:
+            if info[2] == imp.PKG_DIRECTORY:
+                filename = filename+os.sep+'__init__.py'
+            #DEBUG information, please remove
+            if not filename in self.__caught:
+                self.note('Caught %s', filename)
+            self.__caught.add(filename)
+        return ModuleLoader.load_module(self, name, stuff)
+
+class ModuleImporterHook(ModuleImporter):
+    def ensure_fromlist(self, m, fromlist, recursive=0):
+        try:
+            ModuleImporter.ensure_fromlist(self, m, fromlist, recursive)
+        except ValueError:
+            # It's recommended to fix django to never reach this place 
+            # and remove this except case, see http://bugs.python.org/issue2090
+            # and related django bugs: #6587 and #6579
+            # XXX: Turn it on to catch empty-name module imports. 
+            # print 'Importing empty module with __import__:', m.__name__ 
+            pass
+        except ImportError:
+            # ihooks catches missing fromlist imports by default 
+            pass    
+
+loader = None
+def hook_imports(verbose=False):
+    global loader
+    loader = ModuleLoaderHook()
+    importer = ModuleImporterHook(loader=loader, verbose=verbose)
+    ihooks.install(importer)
+
 def code_changed():
     global _mtimes, _win
-    for filename in filter(lambda v: v, map(lambda m: getattr(m, "__file__", None), sys.modules.values())):
+    files = filter(lambda v: v, map(lambda m: getattr(m, "__file__", None), sys.modules.values()))
+    if loader:
+        files = loader.tracked()
+    for filename in files:
         if filename.endswith(".pyc") or filename.endswith(".pyo"):
             filename = filename[:-1]
         if not os.path.exists(filename):
@@ -107 +160 @@
 
 
 def main(main_func, args=None, kwargs=None):
+    hook_imports()
     if args is None:
         args = ()
     if kwargs is None: