From a5d3e0c3ef8975bfc8ab5bd4c13c27edab43b86b Mon Sep 17 00:00:00 2001
From: Jacob Kaplan-Moss <jacob@jacobian.org>
Date: Tue, 26 Dec 2006 14:40:33 +0000
Subject: [PATCH] Fixed #3187 -- Django will now look for the root URLconf as
an attribute of the request object, if available. This lets middleware
override the urlconf as needed. Thanks, Fredrik Lundh.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
django/core/handlers/base.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py
index 85473a6353..ca48b301d4 100644
--- a/django/core/handlers/base.py
+++ b/django/core/handlers/base.py
@@ -60,7 +60,10 @@ class BaseHandler(object):
if response:
return response
- resolver = urlresolvers.RegexURLResolver(r'^/', settings.ROOT_URLCONF)
+ # Get urlconf from request object, if available. Otherwise use default.
+ urlconf = getattr(request, "urlconf", settings.ROOT_URLCONF)
+
+ resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
try:
callback, callback_args, callback_kwargs = resolver.resolve(request.path)