Changeset 1566

Timestamp:

12/28/06 13:03:35

Author:

fumanchu

Message:

2.x backport of [1220] (Fix for #438 (autoreload.py: Server fails to start if a .pyc is imported with no corresponding .py)) and [1337] (New engine.autoreload.match attribute for filtering autoreload to a single package.)

Files:

• branches/cherrypy-2.x/cherrypy/lib/autoreload.py (modified) (2 diffs)

branches/cherrypy-2.x/cherrypy/lib/autoreload.py

@@ -2 +2 @@
-# stolen a lot from Ian Bicking's WSGIKit (www.wsgikit.org)
-
+import errno
-import os
+import re
-import sys
-import time
@@ -10 +12 @@
-reloadFiles = []
-ignoreFiles = ['<string>']
+match = ".*"
+
-
-def reloader_thread(freq):
-    mtimes = {}
-    
-    def fileattr(m):
-        if hasattr(m, "__loader__"):
-            if hasattr(m.__loader__, "archive"):
-                return m.__loader__.archive
-        return getattr(m, "__file__", None)
-    
-    while RUN_RELOADER:
-
+
+
+
+
+
+
+
+
+
+
-            if filename and filename not in ignoreFiles:
+                
+                orig = filename
-                if filename.endswith(".pyc"):
-                    filename = filename[:-1]
+                
+                # Get the last-modified time of the source file.
-                try:
-                    mtime = os.stat(filename).st_mtime
-
+
+
+
+
+
+
+
+
-                    sys.exit(3) # force reload
+                
-                if filename not in mtimes:
-                    mtimes[filename] = mtime
-                    continue
+                
-                if mtime > mtimes[filename]:
-                    sys.exit(3) # force reload