X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=python3%2Fashd%2Fwsgidir.py;h=4b1e4f0c8ad91bfcdac7f09f8e53105fe07abc98;hp=6b7ece7e69770f2710e1602a0a9dd916654561e3;hb=b8d56e8f4550642b7798b88abd102ed5158e83be;hpb=2d4ab4351e9d32bcb32c56118fc64840fc678128 diff --git a/python3/ashd/wsgidir.py b/python3/ashd/wsgidir.py index 6b7ece7..4b1e4f0 100644 --- a/python3/ashd/wsgidir.py +++ b/python3/ashd/wsgidir.py @@ -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):