X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Futil.py;h=64b820fa88752b90645a5f778db87b07e6b605a2;hb=a7b35f84508eb5ab8a890065275e5a0f3bc5bef5;hp=5ee002b0702699c5bb0f5fa78367e82f328356d2;hpb=23d36b18a53d242f5d3c8d9bc2831a0e75900d94;p=wrw.git

diff --git a/wrw/util.py b/wrw/util.py
index 5ee002b..64b820f 100644
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -1,9 +1,9 @@
 import inspect
-import req, dispatch, session, form
+import req, dispatch, session, form, resp
 
 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):
@@ -16,6 +16,9 @@ def formparams(callable):
             for arg in list(args):
                 if arg not in spec.args:
                     del args[arg]
+        for i in xrange(len(spec.args) - len(spec.defaults)):
+            if spec.args[i] not in args:
+                raise resp.httperror(400, "Missing parameter", ("The query parameter `", resp.h.code(spec.args[i]), "' is required but not supplied."))
         return callable(**args)
     return wrapper
 
@@ -34,6 +37,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):