Dolda2000 GitWeb
/
wrw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow parurl to append to URLs that already have a query-string.
[wrw.git]
/
wrw
/
util.py
diff --git
a/wrw/util.py
b/wrw/util.py
index
f70de0d
..
a1dcc6c
100644
(file)
--- a/
wrw/util.py
+++ b/
wrw/util.py
@@
-7,41
+7,39
@@
def wsgiwrap(callable):
wrapper.__wrapped__ = callable
return wrapper
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):
def formparams(callable):
+ spec = inspect.getargspec(callable)
def wrapper(req):
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]
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)
wrapper.__wrapped__ = callable
return wrapper
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)
wrapper.__wrapped__ = callable
return wrapper
-def funplex(*funs, **nfuns):
+class funplex(object):
+ def __init__(self, *funs, **nfuns):
+ self.dir = {}
+ self.dir.update(((self.unwrap(fun).__name__, fun) for fun in funs))
+ self.dir.update(nfuns)
+
+ @staticmethod
def unwrap(fun):
while hasattr(fun, "__wrapped__"):
fun = fun.__wrapped__
return fun
def unwrap(fun):
while hasattr(fun, "__wrapped__"):
fun = fun.__wrapped__
return fun
- dir = {}
- dir.update(((unwrap(fun).__name__, fun) for fun in funs))
- dir.update(nfuns)
- def handler(req):
+
+ def __call__(self, req):
if req.pathinfo == "":
raise resp.redirect(req.uriname + "/")
if req.pathinfo[:1] != "/":
if req.pathinfo == "":
raise resp.redirect(req.uriname + "/")
if req.pathinfo[:1] != "/":
@@
-53,12
+51,23
@@
def funplex(*funs, **nfuns):
else:
p = p.partition("/")[0]
bi = len(p) + 1
else:
p = p.partition("/")[0]
bi = len(p) + 1
- if p in dir:
- return dir[p](req.shift(bi))
+ if p in self.dir:
+ sreq = req.shift(bi)
+ sreq.selfpath = req.pathinfo[1:]
+ return self.dir[p](sreq)
raise resp.notfound()
raise resp.notfound()
- return handler
-def persession(data = None):
+ def add(self, fun):
+ self.dir[self.unwrap(fun).__name__] = fun
+ return fun
+
+ def name(self, name):
+ def dec(fun):
+ self.dir[name] = fun
+ return fun
+ return dec
+
+def persession(data=None):
def dec(callable):
def wrapper(req):
sess = session.get(req)
def dec(callable):
def wrapper(req):
sess = session.get(req)
@@
-106,9
+115,19
@@
def pregen(callable):
wrapper.__wrapped__ = callable
return wrapper
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
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:
sess = cls.sessdb().get(req)
with sess.lock:
try:
@@
-253,6
+272,6
@@
class specdirty(sessiondata, metaclass=specclass):
def datecheck(req, mtime):
if "If-Modified-Since" in req.ihead:
rtime = proto.phttpdate(req.ihead["If-Modified-Since"])
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)
raise resp.unmodified()
req.ohead["Last-Modified"] = proto.httpdate(mtime)