Dolda2000 GitWeb
/
wrw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow None in parurl values to omit keys.
[wrw.git]
/
wrw
/
util.py
diff --git
a/wrw/util.py
b/wrw/util.py
index
79a8240
..
7209ae4
100644
(file)
--- a/
wrw/util.py
+++ b/
wrw/util.py
@@
-7,19
+7,13
@@
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):
spec = inspect.getargspec(callable)
def wrapper(req):
def formparams(callable):
spec = inspect.getargspec(callable)
def wrapper(req):
- data = form.formdata(req)
+ 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:
args = dict(data.items())
args["req"] = req
if not spec.keywords:
@@
-47,6
+41,8
@@
class funplex(object):
def __call__(self, req):
if req.pathinfo == "":
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()
raise resp.redirect(req.uriname + "/")
if req.pathinfo[:1] != "/":
raise resp.notfound()
@@
-58,7
+54,9
@@
class funplex(object):
p = p.partition("/")[0]
bi = len(p) + 1
if p in self.dir:
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):
raise resp.notfound()
def add(self, fun):
@@
-119,6
+117,16
@@
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
def get(cls, req, create=True):
class sessiondata(object):
@classmethod
def get(cls, req, create=True):
@@
-266,6
+274,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)