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
cfc2c8c
..
7c42eae
100644
(file)
--- a/
wrw/util.py
+++ b/
wrw/util.py
@@
-1,32
+1,42
@@
-import inspect
-import req, dispatch, session, form, resp
+import inspect
, math
+from . import req, dispatch, session, form, resp, proto
def wsgiwrap(callable):
def wrapper(env, startreq):
return dispatch.handleenv(env, startreq, callable)
def wsgiwrap(callable):
def wrapper(env, startreq):
return dispatch.handleenv(env, startreq, callable)
+ wrapper.__wrapped__ = callable
return wrapper
def formparams(callable):
return wrapper
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
xrange(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)
+ wrapper.__wrapped__ = callable
return wrapper
return wrapper
-def funplex(*funs, **nfuns):
- dir = {}
- dir.update(((fun.__name__, fun) for fun in funs))
- dir.update(nfuns)
- def handler(req):
+class funplex(object):
+ def __init__(self, *funs, **nfuns):
+ self.dir = {}
+ self.dir.update(((self.unwrap(fun).__name__, fun) for fun in funs))
+ self.dir.update(nfuns)
+
+ @staticmethod
+ def unwrap(fun):
+ while hasattr(fun, "__wrapped__"):
+ fun = fun.__wrapped__
+ return fun
+
+ def __call__(self, req):
if req.pathinfo == "":
raise resp.redirect(req.uriname + "/")
if req.pathinfo[:1] != "/":
if req.pathinfo == "":
raise resp.redirect(req.uriname + "/")
if req.pathinfo[:1] != "/":
@@
-38,12
+48,21
@@
def funplex(*funs, **nfuns):
else:
p = p.partition("/")[0]
bi = len(p) + 1
else:
p = p.partition("/")[0]
bi = len(p) + 1
- if p in dir:
- return dir[p](req.shift(bi))
+ if p in
self.
dir:
+ return
self.
dir[p](req.shift(bi))
raise resp.notfound()
raise resp.notfound()
- return handler
-def persession(data = None):
+ def add(self, fun):
+ self.dir[self.unwrap(fun).__name__] = fun
+ return fun
+
+ def name(self, name):
+ def dec(fun):
+ self.dir[name] = fun
+ return fun
+ return dec
+
+def persession(data=None):
def dec(callable):
def wrapper(req):
sess = session.get(req)
def dec(callable):
def wrapper(req):
sess = session.get(req)
@@
-55,6
+74,7
@@
def persession(data = None):
sess[data] = data()
sess[callable] = callable(data)
return sess[callable].handle(req)
sess[data] = data()
sess[callable] = callable(data)
return sess[callable].handle(req)
+ wrapper.__wrapped__ = callable
return wrapper
return dec
return wrapper
return dec
@@
-65,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
@@
-87,11
+107,22
@@
class preiter(object):
def pregen(callable):
def wrapper(*args, **kwargs):
return preiter(callable(*args, **kwargs))
def pregen(callable):
def wrapper(*args, **kwargs):
return preiter(callable(*args, **kwargs))
+ wrapper.__wrapped__ = callable
return wrapper
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:
@@
-110,7
+141,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
@@
-122,18
+153,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):
@@
-176,7
+207,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__:
@@
-188,8
+219,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):
@@
-197,7
+227,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__()
@@
-233,3
+263,10
@@
class specdirty(sessiondata):
ss[i] = specslot.unbound
else:
ss[i] = val
ss[i] = specslot.unbound
else:
ss[i] = val
+
+def datecheck(req, mtime):
+ if "If-Modified-Since" in req.ihead:
+ rtime = proto.phttpdate(req.ihead["If-Modified-Since"])
+ if rtime >= math.floor(mtime):
+ raise resp.unmodified()
+ req.ohead["Last-Modified"] = proto.httpdate(mtime)