From 10f3ffeba5689f21f405caf2f93a3953ae5f1c80 Mon Sep 17 00:00:00 2001 From: Fredrik Tolf Date: Sat, 17 May 2014 04:05:30 +0200 Subject: [PATCH] python: Added a global wsgidir module attribute to indicate currentness. --- python3/ashd/wsgidir.py | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/python3/ashd/wsgidir.py b/python3/ashd/wsgidir.py index c6fa1ad..9fc3649 100644 --- a/python3/ashd/wsgidir.py +++ b/python3/ashd/wsgidir.py @@ -58,6 +58,20 @@ class cachedmod(object): self.mod = mod self.mtime = mtime +class current(object): + def __init__(self): + self.cond = threading.Condition() + self.current = True + def wait(self, timeout=None): + with self.cond: + self.cond.wait(timeout) + def uncurrent(self): + with self.cond: + self.current = False + self.cond.notify_all() + def __bool__(self): + return self.current + modcache = {} cachelock = threading.Lock() @@ -97,8 +111,16 @@ def getmod(path): code = compile(text, path, "exec") mod = types.ModuleType(mangle(path)) mod.__file__ = path - exec(code, mod.__dict__) - entry[1] = cachedmod(mod, sb.st_mtime) + mod.__current__ = current() + try: + exec(code, mod.__dict__) + except: + mod.__current__.uncurrent() + raise + else: + if entry[1] is not None: + entry[1].mod.__current__.uncurrent() + entry[1] = cachedmod(mod, sb.st_mtime) return entry[1] def importlocal(filename): -- 2.11.0