Ticket #1889: paginate_strict.patch

turbogears/controllers.py

@@ -394 +394 @@
-        tg_util.remove_keys(kw, ["tg_random", "tg_format"]
-            + config.get("tg.ignore_parameters", []))
-    else:
+        try:
+            tg_kw = dict([(k, v) for k, v in kw.items() if k in func._tg_args])
+        except AttributeError:
+            tg_kw = {}
-        args, kw = tg_util.adapt_call(func, args, kw)
+        kw.update(tg_kw)
-    if config.get('server.environment', 'development') == 'development':
-        # Only output this in development mode: If it's a field storage object,
-        # this means big memory usage, and we don't want that in production

turbogears/paginate.py

@@ -112 +112 @@
-
-    def entangle(func):
-
+        get = turbogears.config.get
+
-        def decorated(func, *args, **kw):
-
-            get = turbogears.config.get
-
-            def kwpop(name, default=None):
-                return kw.pop(var_name + '_tgp_' + name,
-                    kw.pop('tg_paginate_' + name, default))
@@ -298 +298 @@
-                        for i in xrange(offset, endpoint)]
-
-            return output
+        if not get('tg.strict_parameters', False):
+            try:
+                args = func._tg_args
+            except AttributeError:
+                args = set()
+            for arg in 'no', 'limit', 'order', 'ordering':
+                args.add(var_name + '_tgp_' + arg)
+                args.add('tg_paginate' + arg)
+            func._tg_args = args
-        return decorated
-    return weak_signature_decorator(entangle)
-