return wrapper
def formparams(callable):
+ spec = inspect.getargspec(callable)
def wrapper(req):
- data = form.formdata(req)
- spec = inspect.getargspec(callable)
+ try:
+ data = form.formdata(req)
+ except IOError:
+ raise resp.httperror(400, "Invalid request", "Form data was incomplete")
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 xrange(len(spec.args) - len(spec.defaults)):
+ for i in xrange(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)
p = p.partition("/")[0]
bi = len(p) + 1
if p in self.dir:
- return self.dir[p](req.shift(bi))
+ sreq = req.shift(bi)
+ sreq.selfpath = req.pathinfo[1:]
+ return self.dir[p](sreq)
raise resp.notfound()
def add(self, fun):
return fun
return dec
-def persession(data = None):
+def persession(data=None):
def dec(callable):
def wrapper(req):
sess = session.get(req)
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:
def datecheck(req, mtime):
if "If-Modified-Since" in req.ihead:
rtime = proto.phttpdate(req.ihead["If-Modified-Since"])
- if rtime >= math.floor(mtime):
+ if rtime is not None and rtime >= math.floor(mtime):
raise resp.unmodified()
req.ohead["Last-Modified"] = proto.httpdate(mtime)