Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #11960 -- Improved error message for redirects. Thanks, mattmcc

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 2ef52d0ce20da72e2728fa7d7cdb129935e26ac8 1 parent cc25361
@adrianholovaty adrianholovaty authored
View
3  django/shortcuts/__init__.py
@@ -49,6 +49,9 @@ def redirect(to, *args, **kwargs):
try:
return redirect_class(urlresolvers.reverse(to, args=args, kwargs=kwargs))
except urlresolvers.NoReverseMatch:
+ # If this is a callable, re-raise.
+ if callable(to):
+ raise
# If this doesn't "feel" like a URL, re-raise.
if '/' not in to and '.' not in to:
raise
View
6 tests/regressiontests/urlpatterns_reverse/tests.py
@@ -165,6 +165,12 @@ def test_redirect_to_url(self):
res = redirect('http://example.com/')
self.assertEqual(res['Location'], 'http://example.com/')
+ def test_redirect_view_object(self):
+ from views import absolute_kwargs_view
+ res = redirect(absolute_kwargs_view)
+ self.assertEqual(res['Location'], '/absolute_arg_view/')
+ self.assertRaises(NoReverseMatch, redirect, absolute_kwargs_view, wrong_argument=None)
+
class NamespaceTests(TestCase):
urls = 'regressiontests.urlpatterns_reverse.namespace_urls'
Please sign in to comment.
Something went wrong with that request. Please try again.