Dolda2000 GitWeb
/
wrw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into python3
[wrw.git]
/
wrw
/
util.py
diff --git
a/wrw/util.py
b/wrw/util.py
index
f70de0d
..
ed32cc6
100644
(file)
--- a/
wrw/util.py
+++ b/
wrw/util.py
@@
-33,15
+33,19
@@
def formparams(callable):
wrapper.__wrapped__ = callable
return wrapper
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,10
+57,19
@@
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:
+ return
self.
dir[p](req.shift(bi))
raise resp.notfound()
raise resp.notfound()
- return handler
+
+ 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 persession(data = None):
def dec(callable):