Merge branch 'master' into jython

diff --git a/wrw/session.py b/wrw/session.py
index 43b9087..24d89d7 100644 (file)
--- a/wrw/session.py
+++ b/wrw/session.py
@@ -1,3 +1,4 @@
+from __future__ import with_statement
 import threading, time, pickle, random, os
 import cookie, env
 

diff --git a/wrw/util.py b/wrw/util.py
index 5ee002b..2e3a795 100644 (file)
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -1,3 +1,4 @@
+from __future__ import with_statement
 import inspect
 import req, dispatch, session, form
 
@@ -12,9 +13,9 @@ def formparams(callable):
         spec = inspect.getargspec(callable)
         args = dict(data.items())
         args["req"] = req
-        if not spec.keywords:
+        if not spec[2]:
             for arg in list(args):
-                if arg not in spec.args:
+                if arg not in spec[0]:
                     del args[arg]
         return callable(**args)
     return wrapper

diff --git a/wrw/wmako.py b/wrw/wmako.py
index 491d8b3..86bc201 100644 (file)
--- a/wrw/wmako.py
+++ b/wrw/wmako.py
@@ -1,3 +1,4 @@
+from __future__ import with_statement
 import os, threading
 from mako import template, lookup, filters
 import util, form, session, env