From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 4 Jun 2013 13:24:01 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=2a5a8ce70a0107b7bfd5bd3459ae4aae3a7558e2;hp=8fec8547c47c0452333972f554f328d0c8e61be2

Merge branch 'master' into python3

Conflicts:
	wrw/util.py
---

diff --git a/wrw/dispatch.py b/wrw/dispatch.py
index 768d3f4..5276892 100644
--- a/wrw/dispatch.py
+++ b/wrw/dispatch.py
@@ -24,6 +24,7 @@ def defaulterror(req, excinfo):
 def wraphandler(handler, excinfo):
     def wrapped(req):
         return handler(req, excinfo)
+    wrapped.__wrapped__ = handler
     return wrapped
 
 errorhandler = env.var(defaulterror)
diff --git a/wrw/resp.py b/wrw/resp.py
index b62ce0e..69635f8 100644
--- a/wrw/resp.py
+++ b/wrw/resp.py
@@ -71,3 +71,9 @@ class redirect(dispatch.restart):
         req.status(self.status, "Redirect")
         req.ohead["Location"] = proto.appendurl(proto.requrl(req), self.url)
         return []
+
+class unmodified(dispatch.restart):
+    def handle(self, req):
+        req.status(304, "Not Modified")
+        req.ohead["Content-Length"] = "0"
+        return []
diff --git a/wrw/util.py b/wrw/util.py
index eb27683..f70de0d 100644
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -1,9 +1,10 @@
-import inspect
-from . 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)
+    wrapper.__wrapped__ = callable
     return wrapper
 
 def stringwrap(charset):
@@ -29,11 +30,16 @@ def formparams(callable):
             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
 
 def funplex(*funs, **nfuns):
+    def unwrap(fun):
+        while hasattr(fun, "__wrapped__"):
+            fun = fun.__wrapped__
+        return fun
     dir = {}
-    dir.update(((fun.__name__, fun) for fun in funs))
+    dir.update(((unwrap(fun).__name__, fun) for fun in funs))
     dir.update(nfuns)
     def handler(req):
         if req.pathinfo == "":
@@ -64,6 +70,7 @@ def persession(data = None):
                         sess[data] = data()
                     sess[callable] = callable(data)
             return sess[callable].handle(req)
+        wrapper.__wrapped__ = callable
         return wrapper
     return dec
 
@@ -96,6 +103,7 @@ class preiter(object):
 def pregen(callable):
     def wrapper(*args, **kwargs):
         return preiter(callable(*args, **kwargs))
+    wrapper.__wrapped__ = callable
     return wrapper
 
 class sessiondata(object):
@@ -241,3 +249,10 @@ class specdirty(sessiondata, metaclass=specclass):
                 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)