Ticket #2377: TurboGears2-2.1dev-dispatch.patch

tg/controllers/decoratedcontroller.py

@@ -81 +81 @@
             controller.decoration.run_hooks('before_validate', remainder,
                                             params)
 
-            validate_params = self._get_params_with_argspec(controller, params, remainder)
+            validate_params, remainder = self._get_params_with_argspec(controller, params, remainder)
 
             for ignore in config.get('ignore_parameters', []):
                 if params.get(ignore):

tg/controllers/dispatcher.py

@@ -105 +105 @@
             for i, var in enumerate(argvars):
                 if i >= len(remainder):
                     break
-                params[var] = remainder[i]
-        return params
+                params[var] = remainder.pop(i)
+        return params, remainder
 
     def _remove_argspec_params_from_params(self, func, params, remainder):
         """Remove parameters from the argument list that are