Changeset 760

Timestamp:

02/13/06 04:04:08 (3 years ago)

Author:

simon

Message:

Changed bind_args to transform the handler not registrant.
Since this makes it completely generic, moved to util.

Files:

• trunk/turbogears/errorhandling.py (modified) (2 diffs)
• trunk/turbogears/tests/test_errorhandling.py (modified) (2 diffs)
• trunk/turbogears/util.py (modified) (2 diffs)

trunk/turbogears/errorhandling.py

@@ -7 +7 @@
-
-import turbogears.util as tg_util
-from turbogears.decorator import decorator
-
-
@@ -139 +138 @@
-    return registrant
-
-def bind_args(**add):
-    """ Call with additional arguments.  """
-    def entagle(registrant):
-        def call(handler, rules=None):
-            def newhandler(handler, *args, **kw):
-                kw.update(add)
-                return handler(*args, **kw)
-            return registrant(decorator(newhandler)(handler), rules)
-        return call
-    return entagle
-
-__all__ = ["dispatch_error", "dispatch_error_adaptor", "try_call",
-, "bind_args"
+

trunk/turbogears/tests/test_errorhandling.py

@@ -6 +6 @@
-from turbogears.controllers import error_handler, exception_handler, \
-                                   expose, validate
-errorhandling
+util
-from turbogears import validators
-from turbogears import testutil
@@ -134 +134 @@
-    def bindargs(self, bar=""):
-        return dict(title="Bind arguments to error handler")
-bind_args(baz=123)(error_handler)(simpleerrorhandler
+error_handler(bind_args(baz=123)(simpleerrorhandler)
-    bindargs = validate(validators={"bar":validators.Int()})(bindargs)
-    bindargs = expose()(bindargs)

trunk/turbogears/util.py

@@ -8 +8 @@
-import pkg_resources
-import setuptools
+
+from turbogears.decorator import decorator
-
-
@@ -225 +227 @@
-    return args, kw
-
+def bind_args(**add):
+    """ Call with arguments set to a predefined value.  """
+    def entagle(func):
+        def call(func, *args, **kw):
+            kw.update(add)
+            return func(*args, **kw)
+        return decorator(call)(func)
+    return entagle
+
-__all__ = ["Enum", "setlike", "get_package_name", "get_model",
-           "DictObj", "DictWrapper", "url", "ensure_sequence",
-           "to_kw", "from_kw", "remove_excess_args", "infinite_recursion",
-
+, "bind_args"