Ticket #2835: 3874-process-remove-kwargs-in-urlconf.diff

django/core/urlresolvers.py

@@ -160 +160 @@
                     tried.extend([(pattern.regex.pattern + '   ' + t) for t in e.args[0]['tried']])
                 else:
                     if sub_match:
+
+                        process_kwargs = []
+                        if self.default_kwargs.get('process_kwargs'):
+                            process_kwargs = self.default_kwargs['process_kwargs']
+                            del self.default_kwargs['process_kwargs']
+ 
+                        remove_kwargs = []
+                        if self.default_kwargs.get('remove_kwargs'):
+                            remove_kwargs = self.default_kwargs['remove_kwargs']
+                            del self.default_kwargs['remove_kwargs']
+                         
                         sub_match_dict = dict(self.default_kwargs, **sub_match[2])
-                        return sub_match[0], sub_match[1], dict(match.groupdict(), **sub_match_dict)
+                        all_args = [sub_match[0], sub_match[1], dict(match.groupdict(), **sub_match_dict)]
+
+                        for key in process_kwargs:
+                            if all_args[2].has_key(key):
+                                to_call=all_args[2][key]
+                                all_args[2] = dict(all_args[2], **to_call(all_args) )                        
+
+                        for key in remove_kwargs:
+                            if all_args[2].has_key(key):
+                                del all_args[2][key]
+    
+                        return all_args                        
+
                     tried.append(pattern.regex.pattern)
             raise Resolver404, {'tried': tried, 'path': new_path}