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
79a8240
..
7c42eae
100644
(file)
--- a/
wrw/util.py
+++ b/
wrw/util.py
@@
-7,15
+7,6
@@
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):
@@
-119,6
+110,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):