Author: russellm
Date: 2010-08-14 09:27:35 -0500 (Sat, 14 Aug 2010)
New Revision: 13590
Modified:
django/trunk/django/core/urlresolvers.py
django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py
django/trunk/tests/regressiontests/urlpatterns_reverse/views.py
Log:
Fixed #5350 -- Added fallback to default 404/500 handlers when they're not
explicitly specified (or imported) in a urls.py file. Thanks to Thomas
G?\195?\188ttler for the report and initial patch.
Modified: django/trunk/django/core/urlresolvers.py
===================================================================
--- django/trunk/django/core/urlresolvers.py 2010-08-14 13:43:13 UTC (rev
13589)
+++ django/trunk/django/core/urlresolvers.py 2010-08-14 14:27:35 UTC (rev
13590)
@@ -284,7 +284,12 @@
url_patterns = property(_get_url_patterns)
def _resolve_special(self, view_type):
- callback = getattr(self.urlconf_module, 'handler%s' % view_type)
+ callback = getattr(self.urlconf_module, 'handler%s' % view_type, None)
+ if not callback:
+ # No handler specified in file; use default
+ # Lazy import, since urls.defaults imports this file
+ from django.conf.urls import defaults
+ callback = getattr(defaults, 'handler%s' % view_type)
try:
return get_callable(callback), {}
except (ImportError, AttributeError), e:
Modified: django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py
===================================================================
--- django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py
2010-08-14 13:43:13 UTC (rev 13589)
+++ django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py
2010-08-14 14:27:35 UTC (rev 13590)
@@ -356,6 +356,22 @@
self.assertEqual(self.callable_resolver.resolve404(), handler)
self.assertEqual(self.callable_resolver.resolve500(), handler)
+class DefaultErrorHandlerTests(TestCase):
+ urls = 'regressiontests.urlpatterns_reverse.urls_without_full_import'
+
+ def test_default_handler(self):
+ "If the urls.py doesn't specify handlers, the defaults are used"
+ try:
+ response = self.client.get('/test/')
+ self.assertEquals(response.status_code, 404)
+ except AttributeError:
+ self.fail("Shouldn't get an AttributeError due to undefined 404
handler")
+
+ try:
+ self.assertRaises(ValueError, self.client.get, '/bad_view/')
+ except AttributeError:
+ self.fail("Shouldn't get an AttributeError due to undefined 500
handler")
+
class NoRootUrlConfTests(TestCase):
"""Tests for handler404 and handler500 if urlconf is None"""
urls = None
Modified: django/trunk/tests/regressiontests/urlpatterns_reverse/views.py
===================================================================
--- django/trunk/tests/regressiontests/urlpatterns_reverse/views.py
2010-08-14 13:43:13 UTC (rev 13589)
+++ django/trunk/tests/regressiontests/urlpatterns_reverse/views.py
2010-08-14 14:27:35 UTC (rev 13590)
@@ -1,14 +1,19 @@
+from django.http import HttpResponse
+
def empty_view(request, *args, **kwargs):
- pass
+ return HttpResponse('')
def kwargs_view(request, arg1=1, arg2=2):
- pass
+ return HttpResponse('')
def absolute_kwargs_view(request, arg1=1, arg2=2):
- pass
+ return HttpResponse('')
class ViewClass(object):
def __call__(self, request, *args, **kwargs):
- pass
+ return HttpResponse('')
view_class_instance = ViewClass()
+
+def bad_view(request, *args, **kwargs):
+ raise ValueError("I don't think I'm getting good value for this view")
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
