Ticket #4129: 5079-patch_for_url_and_prefix_2.diff

django/conf/urls/defaults.py

@@ -10 +10 @@
 def patterns(prefix, *args):
     pattern_list = []
     for t in args:
+        if len(prefix) > 0 and getattr(t, '_callback_str', False):
+            t.callback = prefix + '.' + t._callback_str
+
         if isinstance(t, (list, tuple)):
             pattern_list.append(url(prefix=prefix, *t))
         else:

django/core/urlresolvers.py

@@ -94 +94 @@
         # which represents the path to a module and a view function name, or a
         # callable object (view).
         self.regex = re.compile(regex)
-        if callable(callback):
-            self._callback = callback
-        else:
-            self._callback = None
-            self._callback_str = callback
         self.default_args = default_args or {}
         self.name = name
+        self.callback = callback
 
     def resolve(self, path):
         match = self.regex.search(path)
@@ -118 +114 @@
 
             return self.callback, args, kwargs
 
+    def _set_callback(self, callback):
+        if callable(callback):
+            self._callback = callback
+        else:
+            self._callback = None
+            self._callback_str = callback
+
     def _get_callback(self):
         if self._callback is not None:
             return self._callback
@@ -129 +132 @@
         except AttributeError, e:
             raise ViewDoesNotExist, "Tried %s in module %s. Error was: %s" % (func_name, mod_name, str(e))
         return self._callback
-    callback = property(_get_callback)
+    callback = property(_get_callback, _set_callback)
 
     def reverse(self, viewname, *args, **kwargs):
         mod_name, func_name = get_mod_func(viewname)