X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=blobdiff_plain;f=wrw%2Fdispatch.py;h=4d22b72836550b75be305b2927b3311327c4b66a;hp=fa1f669d8f43099f6c41c3f919689496409cf725;hb=77dd732a3b3b604a6029e748ffd4fb0b9760642d;hpb=7450e2fcc553f66844b34d5c062a965b8fca28c5 diff --git a/wrw/dispatch.py b/wrw/dispatch.py index fa1f669..4d22b72 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): 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, i: handler = i.handle