Ticket #13480: django-1.0.2-nice-ImportError.patch

core/handlers/base.py

@@ -62 +62 @@
         from django.core import exceptions, urlresolvers
         from django.conf import settings
 
+
         # Apply request middleware
-        for middleware_method in self._request_middleware:
-            response = middleware_method(request)
-            if response:
-                return response
+        try:
+            for middleware_method in self._request_middleware:
+                response = middleware_method(request)
+                if response:
+                    return response
+
+        # Catch a ViewDoesNotExist error wrapping an ImportError,
+        # or a naked SyntaxError.
+        except (exceptions.ViewDoesNotExist, SyntaxError), e:
+            if isinstance(e, exceptions.ViewDoesNotExist):
+                if len(e.args) < 3 or not isinstance(e.args[1], ImportError):
+                    raise
+                else:
+                    # Wrapped ImportError, use the packaged exc_info.
+                    exc_info = e.args[2]
+            else: # Naked SyntaxErrror, get the exc_info directly.
+                exc_info = sys.exc_info()
+
+            # Get urlconf from request object, if available.  Otherwise use default.
+            urlconf = getattr(request, "urlconf", settings.ROOT_URLCONF)
+
+            resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
+            receivers = signals.got_request_exception.send(sender=self.__class__, request=request)
+            return self.handle_uncaught_exception(request, resolver, exc_info)
 
         # Get urlconf from request object, if available.  Otherwise use default.
         urlconf = getattr(request, "urlconf", settings.ROOT_URLCONF)

core/urlresolvers.py

@@ -7 +7 @@
     (view_function, function_args, function_kwargs)
 """
 
-import re
+import re, sys
 
 from django.http import Http404
 from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist
@@ -130 +130 @@
             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))
+            raise ViewDoesNotExist("Could not import %s. Error was: %s" % (mod_name, str(e)), e, sys.exc_info())
         except 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))