X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=python3%2Fashd%2Fwsgidir.py;h=4b1e4f0c8ad91bfcdac7f09f8e53105fe07abc98;hp=e7c168c7d697a6d1f957985d7cd39da51b922259;hb=b8d56e8f4550642b7798b88abd102ed5158e83be;hpb=7ed9b82bf5df75bc49e49c548307ad3a146224f6

diff --git a/python3/ashd/wsgidir.py b/python3/ashd/wsgidir.py
index e7c168c..4b1e4f0 100644
--- a/python3/ashd/wsgidir.py
+++ b/python3/ashd/wsgidir.py
@@ -17,7 +17,7 @@ omitted (such that the name is a string with no dots), in which case
 the handler object is looked up from this module.
 
 By default, this module will handle files with the extensions `.wsgi'
-or `.wsgi2' using the `chain' handler, which chainloads such files and
+or `.wsgi3' using the `chain' handler, which chainloads such files and
 runs them as independent WSGI applications. See its documentation for
 details.
 
@@ -36,7 +36,7 @@ functions, you may want to use the getmod() function in this module.
 import os, threading, types, importlib
 from . import wsgiutil
 
-__all__ = ["application", "wmain", "getmod", "cachedmod"]
+__all__ = ["application", "wmain", "getmod", "cachedmod", "chain"]
 
 class cachedmod(object):
     """Cache entry for modules loaded by getmod()
@@ -86,19 +86,18 @@ def getmod(path):
         if path in modcache:
             entry = modcache[path]
         else:
-            entry = cachedmod()
+            entry = [threading.Lock(), None]
             modcache[path] = entry
-    with entry.lock:
-        if entry.mod is None or sb.st_mtime > entry.mtime:
+    with entry[0]:
+        if entry[1] is None or sb.st_mtime > entry[1].mtime:
             with open(path, "rb") as f:
                 text = f.read()
             code = compile(text, path, "exec")
             mod = types.ModuleType(mangle(path))
             mod.__file__ = path
             exec(code, mod.__dict__)
-            entry.mod = mod
-            entry.mtime = sb.st_mtime
-        return entry
+            entry[1] = cachedmod(mod, sb.st_mtime)
+        return entry[1]
 
 class handler(object):
     def __init__(self):