Ticket #8809: django8809-urlerror.diff

conf/urls/defaults.py

@@ +1 @@
+from django.conf import settings
 from django.core.urlresolvers import RegexURLPattern, RegexURLResolver
 from django.core.exceptions import ImproperlyConfigured
 
@@ -25 +26 @@
         elif isinstance(t, RegexURLPattern):
             t.add_prefix(prefix)
         pattern_list.append(t)
+    if settings.DEBUG:
+        # Load up debug information on pattern-origin
+        import inspect
+        import os.path
+        current_frame = inspect.currentframe()
+        if current_frame: # currentframe not always supported
+            calling_frame = inspect.getouterframes(current_frame)[1]
+            origin  = (calling_frame[4], os.path.normpath(calling_frame[1]), calling_frame[2], )
+            for pattern in pattern_list:
+                pattern._origin = origin
     return pattern_list
 
 def url(regex, view, kwargs=None, name=None, prefix=''):

core/urlresolvers.py

@@ -162 +162 @@
             return self._callback
         try:
             self._callback = get_callable(self._callback_str)
-        except ImportError, e:
-            mod_name, _ = get_mod_func(self._callback_str)
-            raise ViewDoesNotExist("Could not import %s. Error was: %s" % (mod_name, str(e)))
-        except AttributeError, e:
+        except (ImportError, AttributeError), e:
             mod_name, func_name = get_mod_func(self._callback_str)
-            raise ViewDoesNotExist("Tried %s in module %s. Error was: %s" % (func_name, mod_name, str(e)))
+            debug_info = ''
+            if settings.DEBUG and hasattr(self, '_origin'): # extra debug info available
+                debug_info = ' from pattern "%s" at %s:%s' % self._origin
+            if isinstance(e, ImportError):
+                raise ViewDoesNotExist("Could not import %s%s. Error was: %s" % (mod_name, debug_info, str(e)))
+            elif isinstance(e, AttributeError):
+                raise ViewDoesNotExist("Tried %s in module %s%s. Error was: %s" % (func_name, mod_name, debug_info, str(e)))
         return self._callback
     callback = property(_get_callback)