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
7a29ea8
..
c8b7b2c
100644
(file)
--- a/
wrw/util.py
+++ b/
wrw/util.py
@@
-1,11
+1,20
@@
import inspect
import inspect
-import req, dispatch, session, form
+
from .
import req, dispatch, session, form
def wsgiwrap(callable):
def wrapper(env, startreq):
return dispatch.handle(req.origrequest(env), startreq, callable)
return wrapper
def wsgiwrap(callable):
def wrapper(env, startreq):
return dispatch.handle(req.origrequest(env), startreq, 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 wrapper(req):
data = form.formdata(req)
def formparams(callable):
def wrapper(req):
data = form.formdata(req)
@@
-36,24
+45,26
@@
def persession(data = None):
class sessiondata(object):
@classmethod
class sessiondata(object):
@classmethod
- def get(cls, req):
+ def get(cls, req
, create = True
):
sess = cls.sessdb().get(req)
with sess.lock:
try:
return sess[cls]
except KeyError:
sess = cls.sessdb().get(req)
with sess.lock:
try:
return sess[cls]
except KeyError:
- ret = cls(req)
+ if not create:
+ return None
+ ret = cls(req, sess)
sess[cls] = ret
return ret
@classmethod
def sessdb(cls):
sess[cls] = ret
return ret
@classmethod
def sessdb(cls):
- return session.default
+ return session.default
.val
class autodirty(sessiondata):
@classmethod
def get(cls, req):
class autodirty(sessiondata):
@classmethod
def get(cls, req):
- ret = super(
autodirty, cls
).get(req)
+ ret = super().get(req)
if "_is_dirty" not in ret.__dict__:
ret.__dict__["_is_dirty"] = False
return ret
if "_is_dirty" not in ret.__dict__:
ret.__dict__["_is_dirty"] = False
return ret
@@
-65,18
+76,18
@@
class autodirty(sessiondata):
return self._is_dirty
def __setattr__(self, name, value):
return self._is_dirty
def __setattr__(self, name, value):
- super(
autodirty, self
).__setattr__(name, value)
+ super().__setattr__(name, value)
if "_is_dirty" in self.__dict__:
self.__dict__["_is_dirty"] = True
def __delattr__(self, name):
if "_is_dirty" in self.__dict__:
self.__dict__["_is_dirty"] = True
def __delattr__(self, name):
- super(
autodirty, self
).__delattr__(name, value)
+ super().__delattr__(name, value)
if "_is_dirty" in self.__dict__:
self.__dict__["_is_dirty"] = True
class manudirty(object):
def __init__(self, *args, **kwargs):
if "_is_dirty" in self.__dict__:
self.__dict__["_is_dirty"] = True
class manudirty(object):
def __init__(self, *args, **kwargs):
- super(
manudirty, self
).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
self.__dirty = False
def sessfrozen(self):
self.__dirty = False
def sessfrozen(self):