Ticket #3224: resolver.diff

django/core/urlresolvers.py

@@ -224 +224 @@
         result = reverse_helper(self.regex, *args, **kwargs)
         return result + sub_match
 
-def resolve(path, urlconf=None):
+def get_resolver(urlconf):
     if urlconf is None:
         from django.conf import settings
         urlconf = settings.ROOT_URLCONF
     resolver = RegexURLResolver(r'^/', urlconf)
-    return resolver.resolve(path)
+    return resolver
 
+def resolve(path, urlconf=None):
+    return get_resolver(urlconf).resolve(path)
+
 def reverse(viewname, urlconf=None, args=None, kwargs=None):
     args = args or []
     kwargs = kwargs or {}

django/core/handlers/base.py

@@ -61 +61 @@
                 return response
 
         # Get urlconf from request object, if available.  Otherwise use default.
-        urlconf = getattr(request, "urlconf", settings.ROOT_URLCONF)
+        urlconf = getattr(request, "urlconf", None)
 
-        resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
+        resolver = urlresolvers.get_resolver(urlconf)
+
         try:
             callback, callback_args, callback_kwargs = resolver.resolve(request.path)