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
55b4ee2
..
eaa6a62
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, resp
def wsgiwrap(callable):
def wrapper(env, startreq):
return dispatch.handleenv(env, startreq, callable)
return wrapper
def wsgiwrap(callable):
def wrapper(env, startreq):
return dispatch.handleenv(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)
@@
-16,6
+25,9
@@
def formparams(callable):
for arg in list(args):
if arg not in spec.args:
del args[arg]
for arg in list(args):
if arg not in spec.args:
del args[arg]
+ for i in range(len(spec.args) - len(spec.defaults)):
+ 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)
return wrapper
return callable(**args)
return wrapper
@@
-41,12
+53,12
@@
class preiter(object):
self.bk = real
self.bki = iter(real)
self._next = None
self.bk = real
self.bki = iter(real)
self._next = None
- self.
next
()
+ self.
__next__
()
def __iter__(self):
return self
def __iter__(self):
return self
- def
next
(self):
+ def
__next__
(self):
if self._next is self.end:
raise StopIteration()
ret = self._next
if self._next is self.end:
raise StopIteration()
ret = self._next
@@
-86,7
+98,7
@@
class sessiondata(object):
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
@@
-98,18
+110,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):
@@
-152,7
+164,7
@@
class specslot(object):
class specclass(type):
def __init__(self, name, bases, tdict):
class specclass(type):
def __init__(self, name, bases, tdict):
- super(
specclass, self
).__init__(name, bases, tdict)
+ super().__init__(name, bases, tdict)
sslots = set()
dslots = set()
for cls in self.__mro__:
sslots = set()
dslots = set()
for cls in self.__mro__:
@@
-164,8
+176,7
@@
class specclass(type):
for i, slot in enumerate(self.__sslots_a__):
setattr(self, slot, specslot(slot, i, slot in dslots))
for i, slot in enumerate(self.__sslots_a__):
setattr(self, slot, specslot(slot, i, slot in dslots))
-class specdirty(sessiondata):
- __metaclass__ = specclass
+class specdirty(sessiondata, metaclass=specclass):
__slots__ = ["session", "__sslots__", "_is_dirty"]
def __specinit__(self):
__slots__ = ["session", "__sslots__", "_is_dirty"]
def __specinit__(self):
@@
-173,7
+184,7
@@
class specdirty(sessiondata):
@staticmethod
def __new__(cls, req, sess):
@staticmethod
def __new__(cls, req, sess):
- self = super(
specdirty, cls
).__new__(cls)
+ self = super().__new__(cls)
self.session = sess
self.__sslots__ = [specslot.unbound] * len(cls.__sslots_a__)
self.__specinit__()
self.session = sess
self.__sslots__ = [specslot.unbound] * len(cls.__sslots_a__)
self.__specinit__()