Changeset 8672 for django/trunk/django/core/urlresolvers.py

Timestamp:

08/28/08 14:05:14 (3 months ago)

Author:

jacob

Message:

Fixed #8221: added some better NoReverseMatch error strings. Thanks, mrts.

Files:

• django/trunk/django/core/urlresolvers.py (modified) (3 diffs)

django/trunk/django/core/urlresolvers.py

@@ -53 +53 @@
-            if func_name != '':
-                lookup_view = getattr(__import__(mod_name, {}, {}, ['']), func_name)
+                if not callable(lookup_view):
+                    raise AttributeError("'%s.%s' is not a callable." % (mod_name, func_name))
-        except (ImportError, AttributeError):
-            if not can_fail:
@@ -197 +199 @@
-        try:
-            lookup_view = getattr(__import__(mod_name, {}, {}, ['']), func_name)
-
-
+
+
+
+
-        if lookup_view != self.callback:
-
+("Reversed view '%s' doesn't match the expected callback ('%s')." % (viewname, self.callback))
-        return self.reverse_helper(*args, **kwargs)
-
@@ -280 +284 @@
-        try:
-            lookup_view = get_callable(lookup_view, True)
-
-'%s' is not a callable." % lookup_view
+, e
+Error importing '%s': %s." % (lookup_view, e)
-        if lookup_view in self.reverse_dict:
-            return u''.join([reverse_helper(part.regex, *args, **kwargs) for part in self.reverse_dict[lookup_view]])
-
+
+
-
-    def reverse_helper(self, lookup_view, *args, **kwargs):