X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Futil.py;h=8eed5a0ac38777396678dd9526d2f537e37dfbdb;hb=09beae7763b330cd6c1018068c7f51eb7b5f1afe;hp=ed32cc6a3f3de4a98a3ea00942c2065856ae97ca;hpb=ca3dce3812e3fc65f4c021aa76ee1430b47ad3af;p=wrw.git

diff --git a/wrw/util.py b/wrw/util.py
index ed32cc6..8eed5a0 100644
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -13,20 +13,21 @@ def stringwrap(charset):
             bk = callable(*args, **kwargs)
             for string in bk:
                 yield string.encode(charset)
+        wrapper.__wrapped__ = callable
         return wrapper
     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 +72,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 +122,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: