X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=blobdiff_plain;f=wrw%2Futil.py;fp=wrw%2Futil.py;h=79a824071610ea9a60e50809d8b2a120290382ef;hp=ed32cc6a3f3de4a98a3ea00942c2065856ae97ca;hb=babf3e21cb06bf867e3ec98003d4a077090b8839;hpb=a9a78095b1696f56946abfc7c284f86a21fdcc2d

diff --git a/wrw/util.py b/wrw/util.py
index ed32cc6..79a8240 100644
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -17,16 +17,16 @@ def stringwrap(charset):
     return dec
 
 def formparams(callable):
+    spec = inspect.getargspec(callable)
     def wrapper(req):
         data = form.formdata(req)
-        spec = inspect.getargspec(callable)
         args = dict(data.items())
         args["req"] = req
         if not spec.keywords:
             for arg in list(args):
                 if arg not in spec.args:
                     del args[arg]
-        for i in range(len(spec.args) - len(spec.defaults)):
+        for i in range(len(spec.args) - (len(spec.defaults) if spec.defaults else 0)):
             if spec.args[i] not in args:
                 raise resp.httperror(400, "Missing parameter", ("The query parameter `", resp.h.code(spec.args[i]), "' is required but not supplied."))
         return callable(**args)
@@ -71,7 +71,7 @@ class funplex(object):
             return fun
         return dec
 
-def persession(data = None):
+def persession(data=None):
     def dec(callable):
         def wrapper(req):
             sess = session.get(req)
@@ -121,7 +121,7 @@ def pregen(callable):
 
 class sessiondata(object):
     @classmethod
-    def get(cls, req, create = True):
+    def get(cls, req, create=True):
         sess = cls.sessdb().get(req)
         with sess.lock:
             try: