Ticket #9589: autoreload.diff

django/utils/autoreload.py

@@ -47 +47 @@
 
 _mtimes = {}
 _win = (sys.platform == "win32")
+_extra_files_to_monitor = []
 
 def code_changed():
-    global _mtimes, _win
-    for filename in filter(lambda v: v, map(lambda m: getattr(m, "__file__", None), sys.modules.values())):
+    def check(filename):
+        global _mtimes, _win
         if filename.endswith(".pyc") or filename.endswith(".pyo"):
             filename = filename[:-1]
         if not os.path.exists(filename):
-            continue # File might be in an egg, so it can't be reloaded.
+            return False # File might be in an egg, so it can't be reloaded.
         stat = os.stat(filename)
         mtime = stat.st_mtime
         if _win:
             mtime -= stat.st_ctime
         if filename not in _mtimes:
             _mtimes[filename] = mtime
-            continue
+            return False
         if mtime != _mtimes[filename]:
             _mtimes = {}
             return True
+
+    for filename in filter(lambda v: v, map(lambda m: getattr(m, "__file__", None), sys.modules.values())):
+        if check(filename): return True
+    for filename in _extra_files_to_monitor:
+        if check(filename): return True
     return False
 
 def reloader_thread():
@@ -84 +90 @@
         if exit_code != 3:
             return exit_code
 
+def watched_main_func(*args, **kwargs): 
+    try: 
+        return args[0](*args[1:], **kwargs) 
+    except StandardError: 
+        # Keep track of files that fail to load, so we can still try to
+        # monitor them for changes.  This won't work if the cause of the
+        # exception is external.
+        t, v, tb = sys.exc_info() 
+        if t == SyntaxError: 
+            _extra_files_to_monitor.append(v.filename)
+        else: 
+            while tb: 
+                filename = tb.tb_frame.f_code.co_filename 
+                if filename: 
+                    _extra_files_to_monitor.append(filename)
+                tb = tb.tb_next 
+        raise 
+
 def python_reloader(main_func, args, kwargs):
     if os.environ.get("RUN_MAIN") == "true":
-        thread.start_new_thread(main_func, args, kwargs)
+        thread.start_new_thread(watched_main_func, (main_func,) + args, kwargs)
         try:
             reloader_thread()
         except KeyboardInterrupt:
@@ -99 +123 @@
 
 def jython_reloader(main_func, args, kwargs):
     from _systemrestart import SystemRestart
-    thread.start_new_thread(main_func, args)
+    thread.start_new_thread(watched_main_func, (main_func,) + args, kwargs)
     while True:
         if code_changed():
             raise SystemRestart