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 python2
[wrw.git]
/
wrw
/
util.py
diff --git
a/wrw/util.py
b/wrw/util.py
index
79a8240
..
f70680e
100644
(file)
--- a/
wrw/util.py
+++ b/
wrw/util.py
@@
-1,5
+1,5
@@
import inspect, math
import inspect, math
-
from .
import req, dispatch, session, form, resp, proto
+import req, dispatch, session, form, resp, proto
def wsgiwrap(callable):
def wrapper(env, startreq):
def wsgiwrap(callable):
def wrapper(env, startreq):
@@
-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):
@@
-26,7
+17,7
@@
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.defaults else 0)):
+ for i in
x
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)
@@
-94,12
+85,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
@@
-140,7
+131,7
@@
class sessiondata(object):
class autodirty(sessiondata):
@classmethod
def get(cls, req):
class autodirty(sessiondata):
@classmethod
def get(cls, req):
- ret = super().get(req)
+ ret = super(
autodirty, cls
).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
@@
-152,18
+143,18
@@
class autodirty(sessiondata):
return self._is_dirty
def __setattr__(self, name, value):
return self._is_dirty
def __setattr__(self, name, value):
- super().__setattr__(name, value)
+ super(
autodirty, self
).__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().__delattr__(name, value)
+ super(
autodirty, self
).__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().__init__(*args, **kwargs)
+ super(
manudirty, self
).__init__(*args, **kwargs)
self.__dirty = False
def sessfrozen(self):
self.__dirty = False
def sessfrozen(self):
@@
-206,7
+197,7
@@
class specslot(object):
class specclass(type):
def __init__(self, name, bases, tdict):
class specclass(type):
def __init__(self, name, bases, tdict):
- super().__init__(name, bases, tdict)
+ super(
specclass, self
).__init__(name, bases, tdict)
sslots = set()
dslots = set()
for cls in self.__mro__:
sslots = set()
dslots = set()
for cls in self.__mro__:
@@
-218,7
+209,8
@@
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):
@@
-226,7
+218,7
@@
class specdirty(sessiondata, metaclass=specclass):
@staticmethod
def __new__(cls, req, sess):
@staticmethod
def __new__(cls, req, sess):
- self = super().__new__(cls)
+ self = super(
specdirty, cls
).__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__()
@@
-266,6
+258,6
@@
class specdirty(sessiondata, metaclass=specclass):
def datecheck(req, mtime):
if "If-Modified-Since" in req.ihead:
rtime = proto.phttpdate(req.ihead["If-Modified-Since"])
def datecheck(req, mtime):
if "If-Modified-Since" in req.ihead:
rtime = proto.phttpdate(req.ihead["If-Modified-Since"])
- if rtime >= math.floor(mtime):
+ if rtime
is not None and rtime
>= math.floor(mtime):
raise resp.unmodified()
req.ohead["Last-Modified"] = proto.httpdate(mtime)
raise resp.unmodified()
req.ohead["Last-Modified"] = proto.httpdate(mtime)