X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Futil.py;h=bf78f8e9f6f48efe4b4b876a5d8bae820c72f137;hb=a7a0908019bb95bb2be1c01e97e88f344807ccec;hp=a7f1e4c24a4ede42cc206f51aa269f79248b6323;hpb=b904defe1135d64ae7035b8903c221b0f022b98f;p=wrw.git

diff --git a/wrw/util.py b/wrw/util.py
index a7f1e4c..bf78f8e 100644
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -3,7 +3,7 @@ from . 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 stringwrap(charset):
@@ -43,6 +43,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):