wrapper.__wrapped__ = callable
return wrapper
-def stringwrap(charset):
- def dec(callable):
- def wrapper(*args, **kwargs):
- bk = callable(*args, **kwargs)
- for string in bk:
- yield string.encode(charset)
- return wrapper
- return dec
-
def formparams(callable):
+ sig = inspect.signature(callable)
+ haskw = inspect.Parameter.VAR_KEYWORD in (par.kind for par in sig.parameters.values())
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)):
- 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."))
+ try:
+ data = dict(form.formdata(req).items())
+ except IOError:
+ raise resp.httperror(400, "Invalid request", "Form data was incomplete")
+
+ data["req"] = req
+ if haskw:
+ args = data
+ else:
+ args = {}
+ for par in sig.parameters.values():
+ if par.name in data:
+ args[par.name] = data[par.name]
+ for par in sig.parameters.values():
+ if par.kind is inspect.Parameter.VAR_KEYWORD:
+ continue
+ if par.default is inspect.Parameter.empty and par.name not in args:
+ raise resp.httperror(400, "Missing parameter", ("The query parameter `", resp.h.code(par.name), "' is required but not supplied."))
return callable(**args)
wrapper.__wrapped__ = callable
return wrapper
def __call__(self, req):
if req.pathinfo == "":
+ if "__root__" in self.dir:
+ return self.dir["__root__"](req)
raise resp.redirect(req.uriname + "/")
if req.pathinfo[:1] != "/":
raise resp.notfound()
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)
wrapper.__wrapped__ = callable
return wrapper
+def stringwrap(charset):
+ def dec(callable):
+ @pregen
+ def wrapper(*args, **kwargs):
+ for string in callable(*args, **kwargs):
+ yield string.encode(charset)
+ wrapper.__wrapped__ = callable
+ return wrapper
+ return dec
+
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)