From 1ba439bff713560b0aa5340bd25c57bdc8152d5f Mon Sep 17 00:00:00 2001 From: David Cramer Date: Mon, 18 Apr 2011 16:52:43 -0700 Subject: Ensure if we're overriding the urlconf that we're resetting handler404/500 Signed-off-by: Rob Hudson --- debug_toolbar/middleware.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py index 232d887..7f0f4bc 100644 --- a/debug_toolbar/middleware.py +++ b/debug_toolbar/middleware.py @@ -67,10 +67,14 @@ class DebugToolbarMiddleware(object): def process_request(self, request): if self.show_toolbar(request): if self.override_url: - original_urlconf = getattr(request, 'urlconf', settings.ROOT_URLCONF) + original_urlconf = __import__(getattr(request, 'urlconf', settings.ROOT_URLCONF), {}, {}, ['*']) debug_toolbar.urls.urlpatterns += patterns('', ('', include(original_urlconf)), ) + if hasattr(original_urlconf, 'handler404'): + debug_toolbar.urls.handler404 = original_urlconf.handler404 + if hasattr(original_urlconf, 'handler500'): + debug_toolbar.urls.handler500 = original_urlconf.handler500 self.override_url = False request.urlconf = 'debug_toolbar.urls' -- cgit v1.2.3 From 6479ad305ab763a5eceb68c8eb0806caa6b63f77 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Mon, 25 Apr 2011 11:26:01 -0700 Subject: Bumped version and updated NEWS --- debug_toolbar/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/__init__.py b/debug_toolbar/__init__.py index df5bb74..90f9e2f 100644 --- a/debug_toolbar/__init__.py +++ b/debug_toolbar/__init__.py @@ -1,2 +1,2 @@ -VERSION = (0, 8, 4) +VERSION = (0, 8, 5) __version__ = '.'.join(map(str, VERSION)) -- cgit v1.2.3