Author: russellm
Date: 2009-04-04 01:54:56 -0500 (Sat, 04 Apr 2009)
New Revision: 10385
Added:
django/trunk/tests/regressiontests/urlpatterns_reverse/no_urls.py
Modified:
django/trunk/django/core/urlresolvers.py
django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py
Log:
Fixed #10065 -- Corrected an error message when an empty urlpattern object is
provided. Thanks to Matthew Flanagan for the patch.
Modified: django/trunk/django/core/urlresolvers.py
===================================================================
--- django/trunk/django/core/urlresolvers.py 2009-04-04 05:35:01 UTC (rev
10384)
+++ django/trunk/django/core/urlresolvers.py 2009-04-04 06:54:56 UTC (rev
10385)
@@ -209,7 +209,7 @@
try:
iter(patterns)
except TypeError:
- raise ImproperlyConfigured("The included urlconf %s doesn't have
any"
+ raise ImproperlyConfigured("The included urlconf %s doesn't have
any "
"patterns in it" % self.urlconf_name)
return patterns
url_patterns = property(_get_url_patterns)
Added: django/trunk/tests/regressiontests/urlpatterns_reverse/no_urls.py
===================================================================
--- django/trunk/tests/regressiontests/urlpatterns_reverse/no_urls.py
(rev 0)
+++ django/trunk/tests/regressiontests/urlpatterns_reverse/no_urls.py
2009-04-04 06:54:56 UTC (rev 10385)
@@ -0,0 +1,2 @@
+#from django.conf.urls.defaults import *
+
Modified: django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py
===================================================================
--- django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py
2009-04-04 05:35:01 UTC (rev 10384)
+++ django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py
2009-04-04 06:54:56 UTC (rev 10385)
@@ -1,7 +1,20 @@
"""
Unit tests for reverse URL lookups.
"""
+__test__ = {'API_TESTS': """
+RegexURLResolver should raise an exception when no urlpatterns exist.
+
+>>> from django.core.urlresolvers import RegexURLResolver
+>>> no_urls = 'regressiontests.urlpatterns_reverse.no_urls'
+>>> resolver = RegexURLResolver(r'^$', no_urls)
+>>> resolver.url_patterns
+Traceback (most recent call last):
+...
+ImproperlyConfigured: The included urlconf
regressiontests.urlpatterns_reverse.no_urls doesn't have any patterns in it
+"""}
+
+
from django.core.urlresolvers import reverse, NoReverseMatch
from django.http import HttpResponseRedirect, HttpResponsePermanentRedirect
from django.shortcuts import redirect
@@ -101,21 +114,21 @@
class ReverseShortcutTests(TestCase):
urls = 'regressiontests.urlpatterns_reverse.urls'
-
+
def test_redirect_to_object(self):
# We don't really need a model; just something with a get_absolute_url
class FakeObj(object):
def get_absolute_url(self):
return "/hi-there/"
-
+
res = redirect(FakeObj())
self.assert_(isinstance(res, HttpResponseRedirect))
self.assertEqual(res['Location'], '/hi-there/')
-
+
res = redirect(FakeObj(), permanent=True)
self.assert_(isinstance(res, HttpResponsePermanentRedirect))
self.assertEqual(res['Location'], '/hi-there/')
-
+
def test_redirect_to_view_name(self):
res = redirect('hardcoded2')
self.assertEqual(res['Location'], '/hardcoded/doc.pdf')
@@ -124,7 +137,7 @@
res = redirect('headlines', year='2008', month='02', day='17')
self.assertEqual(res['Location'], '/headlines/2008.02.17/')
self.assertRaises(NoReverseMatch, redirect, 'not-a-view')
-
+
def test_redirect_to_url(self):
res = redirect('/foo/')
self.assertEqual(res['Location'], '/foo/')
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
