Ticket #5034: set_urlconf.diff

django/core/urlresolvers.py

@@ -28 +28 @@
-# be empty.
-_prefixes = {}
-
+# Overridden URLconfs for each thread are stored here.
+_urlconfs = {}
+
-class Resolver404(Http404):
-    pass
-
@@ -296 +299 @@
-        return result + sub_match
-
-def resolve(path, urlconf=None):
+    if urlconf is None:
+        urlconf = get_urlconf()
-    return get_resolver(urlconf).resolve(path)
-
-def reverse(viewname, urlconf=None, args=None, kwargs=None, prefix=None):
+    if urlconf is None:
+        urlconf = get_urlconf()
-    args = args or []
-    kwargs = kwargs or {}
-    if prefix is None:
@@ -328 +335 @@
-    """
-    return _prefixes.get(currentThread(), u'/')
-
+def set_urlconf(urlconf_name):
+    """
+    Sets the URLconf for the current thread (overriding the default one in
+    settings). Set to None to revert back to the default.
+    """
+    thread = currentThread()
+    if urlconf_name:
+        _urlconfs[thread] = urlconf_name
+    else:
+        # This is a lot faster than wrapping in a try/except.
+        if thread in _urlconfs:
+            del _urlconfs[thread]
+
+def get_urlconf(default=None):
+    """
+    Returns the root URLconf to use for the current thread if it has been
+    changed from the default one.
+    """
+    thread = currentThread()
+    # It's faster to check first than to do _urlconfs.get(thread)
+    if thread in _urlconfs:
+        return _urlconfs[thread]
+    return default

django/core/handlers/base.py

@@ -63 +63 @@
-        from django.core import exceptions, urlresolvers
-        from django.conf import settings
-
+        # Reset the urlconf for this thread.
+        urlresolvers.set_urlconf(None)
+
-        # Apply request middleware
-        for middleware_method in self._request_middleware:
-            response = middleware_method(request)
-            if response:
-                return response
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
-        try:

tests/regressiontests/urlpatterns_reverse/middleware.py

@@ +1 @@
+from django.core.urlresolvers import set_urlconf
+
+import urlconf_inner
+
+class ChangeUrlconfMiddleware:
+    def process_request(self, request):
+        set_urlconf(urlconf_inner.__name__)

tests/regressiontests/urlpatterns_reverse/tests.py

@@ -1 +1 @@
-"Unit tests for reverse URL lookup"
-
+import re
+import unittest
+
-from django.core.urlresolvers import reverse_helper, NoReverseMatch
-
+
+
-
+import urlconf_outer
+import urlconf_inner
+import middleware
+
-test_data = (
-    ('^places/(\d+)/$', 'places/3/', [3], {}),
-    ('^places/(\d+)/$', 'places/3/', ['3'], {}),
@@ -36 +44 @@
-            else:
-                self.assertEquals(got, expected)
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

tests/regressiontests/urlpatterns_reverse/urlconf_inner.py

@@ +1 @@
+from django.conf.urls.defaults import *
+from django.template import Template, Context
+from django.http import HttpResponse
+
+def inner_view(request):
+    content = Template('outer:{% url outer %},'
+                       'inner:{% url inner %}').render(Context())
+    return HttpResponse(content)
+
+urlpatterns = patterns('teacher_survey.views',
+    url(r'^second_test/$', inner_view, name='inner'),
+)
+

tests/regressiontests/urlpatterns_reverse/urlconf_outer.py

@@ +1 @@
+from django.conf.urls.defaults import *
+
+import urlconf_inner
+
+urlpatterns = patterns('',
+    url(r'^test/me/$', urlconf_inner.inner_view, name='outer'),
+    url(r'^inner_urlconf/', include(urlconf_inner.__name__))
+)
+

docs/url_dispatch.txt

@@ -34 +34 @@
-
-    1. Django determines the root URLconf module to use. Ordinarily,
-       this is the value of the ``ROOT_URLCONF`` setting in your
-if the incoming ``HttpRequest`` object
-has an attribute called ``urlconf``, its value will be used
-place of the ``ROOT_URLCONF`` setting
+this can be overridden per request by calling the
+``set_urlconf`` method found in ``django.core.urlresolvers`` (passing
+the value to be used in place of the ``ROOT_URLCONF`` setting)
-    2. Django loads that Python module and looks for the variable
-       ``urlpatterns``. This should be a Python list, in the format returned by
-       the function ``django.conf.urls.defaults.patterns()``.

docs/settings.txt

@@ -388 +388 @@
-
-Still, note that there are always going to be sections of your debug output that
-are inappropriate for public consumption. File paths, configuration options, and
- 
+
-
-It is also important to remember that when running with ``DEBUG`` turned on, Django
-will remember every SQL query it executes. This is useful when you are debugging,
@@ -820 +820 @@
-
-Default: Not defined
-
- example:
-
-
-object. See 
+
+example: 
+
+
-
-.. _How Django processes a request: ../url_dispatch/#how-django-processes-a-request
-