From 56e8f0f59acce9ccd1d161b2846f636b3e332b76 Mon Sep 17 00:00:00 2001
From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sat, 1 Sep 2012 06:36:20 +0200
Subject: [PATCH] python: Added a simple function for doing directory-local
 "imports".

---
 python/ashd/wsgidir.py  | 21 +++++++++++++++++++++
 python3/ashd/wsgidir.py | 21 +++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/python/ashd/wsgidir.py b/python/ashd/wsgidir.py
index d406c35..1fc66f9 100644
--- a/python/ashd/wsgidir.py
+++ b/python/ashd/wsgidir.py
@@ -110,6 +110,27 @@ def getmod(path):
     finally:
         entry[0].release()
 
+def importlocal(filename):
+    import inspect
+    cf = inspect.currentframe()
+    if cf is None: raise ImportError("could not get current frame")
+    if cf.f_back is None: raise ImportError("could not get caller frame")
+    cfile = cf.f_back.f_code.co_filename
+    if not os.path.exists(cfile):
+        raise ImportError("caller is not in a proper file")
+    path = os.path.realpath(os.path.join(os.path.dirname(cfile), filename))
+    if '.' not in os.path.basename(path):
+        for ext in [".pyl", ".py"]:
+            if os.path.exists(path + ext):
+                path += ext
+                break
+        else:
+            raise ImportError("could not resolve file: " + filename)
+    else:
+        if not os.path.exists(cfile):
+            raise ImportError("no such file: " + filename)
+    return getmod(path).mod
+
 class handler(object):
     def __init__(self):
         self.lock = threading.Lock()
diff --git a/python3/ashd/wsgidir.py b/python3/ashd/wsgidir.py
index fc7e9ab..c6fa1ad 100644
--- a/python3/ashd/wsgidir.py
+++ b/python3/ashd/wsgidir.py
@@ -101,6 +101,27 @@ def getmod(path):
             entry[1] = cachedmod(mod, sb.st_mtime)
         return entry[1]
 
+def importlocal(filename):
+    import inspect
+    cf = inspect.currentframe()
+    if cf is None: raise ImportError("could not get current frame")
+    if cf.f_back is None: raise ImportError("could not get caller frame")
+    cfile = cf.f_back.f_code.co_filename
+    if not os.path.exists(cfile):
+        raise ImportError("caller is not in a proper file")
+    path = os.path.realpath(os.path.join(os.path.dirname(cfile), filename))
+    if '.' not in os.path.basename(path):
+        for ext in [".pyl", ".py"]:
+            if os.path.exists(path + ext):
+                path += ext
+                break
+        else:
+            raise ImportError("could not resolve file: " + filename)
+    else:
+        if not os.path.exists(cfile):
+            raise ImportError("no such file: " + filename)
+    return getmod(path).mod
+
 class handler(object):
     def __init__(self):
         self.lock = threading.Lock()
-- 
2.11.0