From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sat, 2 Feb 2013 05:29:04 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=a7a0908019bb95bb2be1c01e97e88f344807ccec;hp=cb8bb5edc89f083d161a7c5c9f4ed904838e1266

Merge branch 'master' into python3

Conflicts:
	wrw/dispatch.py
---

diff --git a/wrw/dispatch.py b/wrw/dispatch.py
index 10cc2f6..768d3f4 100644
--- a/wrw/dispatch.py
+++ b/wrw/dispatch.py
@@ -16,32 +16,6 @@ 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 defaulterror(req, excinfo):
     from . import resp
     traceback.print_exception(*excinfo)
@@ -60,7 +34,7 @@ def handle(req, startreq, handler):
         resp = [""]
         while True:
             try:
-                resp = iterproxy(handler(req))
+                resp = handler(req)
                 break
             except restart as i:
                 handler = i.handle
diff --git a/wrw/util.py b/wrw/util.py
index 5347ce4..bf78f8e 100644
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -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):