Ticket #6379: no_exception_hiding.diff

django/core/urlresolvers.py

@@ -178 +178 @@
             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))
+            msg = str(e)
+            if not msg.endswith(mod_name):
+                raise
+            raise ViewDoesNotExist, "Could not import %s. Error was: %s" % (mod_name, msg)
         except AttributeError, e:
             mod_name, func_name = get_mod_func(self._callback_str)
+            msg = str(e)
+            if not (mod_name in msg and func_name in msg):
+                raise
             raise ViewDoesNotExist, "Tried %s in module %s. Error was: %s" % (func_name, mod_name, str(e))
         return self._callback
     callback = property(_get_callback)