From 3d88525fe7d64e5ed3c4e8a5056a6d0dd8224300 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

---
 debug_toolbar/middleware.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'debug_toolbar/middleware.py')

diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index 2a2f001..446bc38 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -73,10 +73,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