Merge branch 'master' into python2

Conflicts:
	wrw/__init__.py

diff --git a/wrw/__init__.py b/wrw/__init__.py
index 3a4c91d..8cc06b1 100644 (file)
--- a/wrw/__init__.py
+++ b/wrw/__init__.py
@@ -1,6 +1,6 @@
 __all__ = ["wsgiwrap", "restart", "cookie", "formdata"]
 
-from .util import wsgiwrap, persession
+from .util import wsgiwrap, persession, sessiondata
 from .dispatch import restart
 from . import cookie
 from .form import formdata

diff --git a/wrw/dispatch.py b/wrw/dispatch.py
index b6009af..50adc04 100644 (file)
--- a/wrw/dispatch.py
+++ b/wrw/dispatch.py
@@ -13,12 +13,38 @@ def mangle(result):
         return result
     return [str(result)]
 
+class iterproxy(object):
+    # Makes sure iter(real).next() is called immediately, in order to
+    # let generator code run.
+    def __init__(self, real):
+        self.bk = real
+        self.bki = iter(real)
+        self._next = [None]
+        self.next()
+
+    def __iter__(self):
+        return self
+
+    def next(self):
+        if self._next is None:
+            raise StopIteration()
+        ret = self._next[0]
+        try:
+            self._next[:] = [self.bki.next()]
+        except StopIteration:
+            self._next = None
+        return ret
+
+    def close(self):
+        if hasattr(self.bk, "close"):
+            self.bk.close()
+
 def handle(req, startreq, handler):
     try:
         resp = [""]
         while True:
             try:
-                resp = handler(req)
+                resp = iterproxy(handler(req))
                 break
             except restart as i:
                 handler = i.handle

diff --git a/wrw/session.py b/wrw/session.py
index b46b818..71ed2d5 100644 (file)
--- a/wrw/session.py
+++ b/wrw/session.py
@@ -129,14 +129,15 @@ class db(object):
                 sess.atime = now
             except KeyError:
                 sess = session()
-                self.live[sess.id] = sess
                 new = True
 
         def ckfreeze(req):
             if sess.dirty():
+                if new:
+                    cookie.add(req, self.cookiename, sess.id, self.path)
+                    with self.lock:
+                        self.live[sess.id] = sess
                 try:
-                    if new:
-                        cookie.add(req, self.cookiename, sess.id, self.path)
                     self.freeze(sess)
                 except:
                     pass

diff --git a/wrw/util.py b/wrw/util.py
index b757e14..b299b0a 100644 (file)
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -19,3 +19,35 @@ def persession(data = None):
             return sess[callable].handle(req)
         return wrapper
     return dec
+
+class sessiondata(object):
+    @classmethod
+    def get(cls, req):
+        sess = cls.sessdb().get(req)
+        with sess.lock:
+            try:
+                return sess[cls]
+            except KeyError:
+                ret = cls(req)
+                ret._is_dirty = [False]
+                sess[cls] = ret
+                return ret
+
+    @classmethod
+    def sessdb(cls):
+        return session.default
+
+    def sessfrozen(self):
+        self._is_dirty[:] = [False]
+
+    def sessdirty(self):
+        return self._is_dirty[0]
+
+    def __setattr__(self, name, value):
+        if hasattr(self, "_is_dirty"):
+            self._is_dirty[:] = [True]
+        super().__setattr__(name, value)
+
+    def __delattr__(self, name):
+        super().__delattr__(name)
+        self._is_dirty[:] = [True]