X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Futil.py;h=55b4ee276b6d6c98b211ff11e4d62b9da667a6df;hb=77dd732a3b3b604a6029e748ffd4fb0b9760642d;hp=d7b52cb17fbae633c5ed4bee2c161d606ef82aaf;hpb=df5f786840523bc4faf8e0f2168df0d3b2638473;p=wrw.git

diff --git a/wrw/util.py b/wrw/util.py
index d7b52cb..55b4ee2 100644
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -3,7 +3,7 @@ import req, dispatch, session, form
 
 def wsgiwrap(callable):
     def wrapper(env, startreq):
-        return dispatch.handle(req.origrequest(env), startreq, callable)
+        return dispatch.handleenv(env, startreq, callable)
     return wrapper
 
 def formparams(callable):
@@ -34,6 +34,37 @@ def persession(data = None):
         return wrapper
     return dec
 
+class preiter(object):
+    __slots__ = ["bk", "bki", "_next"]
+    end = object()
+    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 self.end:
+            raise StopIteration()
+        ret = self._next
+        try:
+            self._next = next(self.bki)
+        except StopIteration:
+            self._next = self.end
+        return ret
+
+    def close(self):
+        if hasattr(self.bk, "close"):
+            self.bk.close()
+
+def pregen(callable):
+    def wrapper(*args, **kwargs):
+        return preiter(callable(*args, **kwargs))
+    return wrapper
+
 class sessiondata(object):
     @classmethod
     def get(cls, req, create = True):
@@ -174,7 +205,6 @@ class specdirty(sessiondata):
         ss = specslot.slist(self)
         for i, nm in enumerate(type(self).__sslots_a__):
             bound, val = st.pop(nm, (False, None))
-            print i, nm, bound, val
             if not bound:
                 ss[i] = specslot.unbound
             else: