From: Fredrik Tolf Date: Sun, 23 Dec 2012 05:48:20 +0000 (+0100) Subject: Merge branch 'master' into jython X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fjython;p=wrw.git Merge branch 'master' into jython --- d4220e473079408b9ef4f520462fed3182a692cd diff --cc wrw/wmako.py index 86bc201,13ce342..92e3e65 --- a/wrw/wmako.py +++ b/wrw/wmako.py @@@ -1,7 -1,6 +1,7 @@@ +from __future__ import with_statement import os, threading from mako import template, lookup, filters - import util, form, session, env + import util, form, session, env, resp # It seems Mako isn't thread-safe. makolock = threading.Lock()