Fixed datecheck bug.

[wrw.git] / wrw / util.py

diff --git a/wrw/util.py b/wrw/util.py
index 8eed5a0..557b25d 100644 (file)
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -7,16 +7,6 @@ def wsgiwrap(callable):
     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)
-        wrapper.__wrapped__ = callable
-        return wrapper
-    return dec
-
 def formparams(callable):
     spec = inspect.getargspec(callable)
     def wrapper(req):
@@ -120,6 +110,16 @@ def pregen(callable):
     wrapper.__wrapped__ = callable
     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
     def get(cls, req, create=True):
@@ -267,6 +267,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"])
-        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)