From 859fc020a7c5ce30784d6388858ffbc613ef6612 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Sat, 14 Aug 2010 14:27:35 +0000 Subject: 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üttler for the report and initial patch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.djangoproject.com/svn/django/trunk@13590 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/urlpatterns_reverse/tests.py | 16 ++++++++++++++++ tests/regressiontests/urlpatterns_reverse/views.py | 13 +++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) (limited to 'tests/regressiontests/urlpatterns_reverse') diff --git a/tests/regressiontests/urlpatterns_reverse/tests.py b/tests/regressiontests/urlpatterns_reverse/tests.py index dcd942649c..008b5700dd 100644 --- a/tests/regressiontests/urlpatterns_reverse/tests.py +++ b/tests/regressiontests/urlpatterns_reverse/tests.py @@ -356,6 +356,22 @@ class ErrorHandlerResolutionTests(TestCase): 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 diff --git a/tests/regressiontests/urlpatterns_reverse/views.py b/tests/regressiontests/urlpatterns_reverse/views.py index 27dca3d0e2..fdd742382c 100644 --- a/tests/regressiontests/urlpatterns_reverse/views.py +++ b/tests/regressiontests/urlpatterns_reverse/views.py @@ -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") -- cgit v1.3