Added a mod_python-style form-data application decorator.

[wrw.git] / wrw / util.py

diff --git a/wrw/util.py b/wrw/util.py
index 3da6053..7a29ea8 100644 (file)
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -1,10 +1,24 @@
-import req, dispatch, session
+import inspect
+import req, dispatch, session, form
 
 def wsgiwrap(callable):
     def wrapper(env, startreq):
         return dispatch.handle(req.origrequest(env), startreq, callable)
     return wrapper
 
+def formparams(callable):
+    def wrapper(req):
+        data = form.formdata(req)
+        spec = inspect.getargspec(callable)
+        args = dict(data.items())
+        args["req"] = req
+        if not spec.keywords:
+            for arg in list(args):
+                if arg not in spec.args:
+                    del args[arg]
+        return callable(**args)
+    return wrapper
+
 def persession(data = None):
     def dec(callable):
         def wrapper(req):
@@ -29,7 +43,6 @@ class sessiondata(object):
                 return sess[cls]
             except KeyError:
                 ret = cls(req)
-                ret._is_dirty = [False]
                 sess[cls] = ret
                 return ret
 
@@ -37,17 +50,40 @@ class sessiondata(object):
     def sessdb(cls):
         return session.default
 
+class autodirty(sessiondata):
+    @classmethod
+    def get(cls, req):
+        ret = super(autodirty, cls).get(req)
+        if "_is_dirty" not in ret.__dict__:
+            ret.__dict__["_is_dirty"] = False
+        return ret
+
     def sessfrozen(self):
-        self._is_dirty[:] = [False]
+        self.__dict__["_is_dirty"] = False
 
     def sessdirty(self):
-        return self._is_dirty[0]
+        return self._is_dirty
 
     def __setattr__(self, name, value):
-        if hasattr(self, "_is_dirty"):
-            self._is_dirty[:] = [True]
-        super(sessiondata, self).__setattr__(name, value)
+        super(autodirty, self).__setattr__(name, value)
+        if "_is_dirty" in self.__dict__:
+            self.__dict__["_is_dirty"] = True
 
     def __delattr__(self, name):
-        super(sessiondata, self).__delattr__(name)
-        self._is_dirty[:] = [True]
+        super(autodirty, self).__delattr__(name, value)
+        if "_is_dirty" in self.__dict__:
+            self.__dict__["_is_dirty"] = True
+
+class manudirty(object):
+    def __init__(self, *args, **kwargs):
+        super(manudirty, self).__init__(*args, **kwargs)
+        self.__dirty = False
+
+    def sessfrozen(self):
+        self.__dirty = False
+
+    def sessdirty(self):
+        return self.__dirty
+
+    def dirty(self):
+        self.__dirty = True