Dolda2000 GitWeb
/
wrw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed stringwrap iteration bug.
[wrw.git]
/
wrw
/
util.py
diff --git
a/wrw/util.py
b/wrw/util.py
index
ed32cc6
..
7c42eae
100644
(file)
--- a/
wrw/util.py
+++ b/
wrw/util.py
@@
-7,26
+7,17
@@
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):
data = form.formdata(req)
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]
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)
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)
@@
-71,7
+62,7
@@
class funplex(object):
return fun
return dec
return fun
return dec
-def persession(data
=
None):
+def persession(data
=
None):
def dec(callable):
def wrapper(req):
sess = session.get(req)
def dec(callable):
def wrapper(req):
sess = session.get(req)
@@
-119,9
+110,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: