From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 5 Jul 2012 03:19:40 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=ad5b93034c1c28f0f4deab4c1b62cb2d6a869f81;hp=09dd8abaebe7bee21670535ae04ec37f0fa644ab

Merge branch 'master' into python3

Conflicts:
	wrw/wmako.py
---

diff --git a/wrw/wmako.py b/wrw/wmako.py
index 817233d..4261938 100644
--- a/wrw/wmako.py
+++ b/wrw/wmako.py
@@ -1,6 +1,6 @@
 import os, threading
 from mako import template, lookup, filters
-from . import util, form, session
+from . import util, form, session, env
 
 # It seems Mako isn't thread-safe.
 makolock = threading.Lock()
@@ -25,13 +25,19 @@ defargs = {"output_encoding": "utf-8",
            "default_filters": ["decode.utf8"],
            "module_directory": cachedir,
     }
-lib = liblookup(directories = libdirs, **defargs)
+
+def makelib(init=liblookup, directories=[], **kwargs):
+    ad = dict(defargs)
+    ad.update(kwargs)
+    return init(directories = libdirs + directories, **ad)
+
+lib = env.var(makelib())
 
 if not os.path.exists(cachedir):
     os.mkdir(cachedir)
 def handle(req, filename, **kw):
     with makolock:
-        tt = template.Template(filename = filename, lookup = lib, **defargs)
+        tt = template.Template(filename = filename, lookup = lib.val, **defargs)
     req.ohead["Content-Type"] = "text/html; charset=utf-8"
     return [tt.render(request = req, **kw)]