Ticket #10326: handlerXXX_callable.2.diff

django/core/urlresolvers.py

@@ -216 +216 @@
 
     def _resolve_special(self, view_type):
         callback = getattr(self.urlconf_module, 'handler%s' % view_type)
-        mod_name, func_name = get_mod_func(callback)
         try:
-            return getattr(import_module(mod_name), func_name), {}
+            return get_callable(callback), {}
         except (ImportError, AttributeError), e:
             raise ViewDoesNotExist, "Tried %s. Error was: %s" % (callback, str(e))
 

tests/regressiontests/urlpatterns_reverse/tests.py

@@ -142 +142 @@
         res = redirect('/foo/')
         self.assertEqual(res['Location'], '/foo/')
         res = redirect('http://example.com/')
-        self.assertEqual(res['Location'], 'http://example.com/')
- No newline at end of file
+        self.assertEqual(res['Location'], 'http://example.com/')
+
+
+class HandlerResolutionTests(TestCase):
+    def setUp(self):
+        from django.core.urlresolvers import RegexURLResolver
+        urlconf = 'regressiontests.urlpatterns_reverse.urls_handlers'
+        urlconf_callables = 'regressiontests.urlpatterns_reverse.urls_handlers_callable'
+        self.resolver = RegexURLResolver(r'^$', urlconf)
+        self.callable_resolver = RegexURLResolver(r'^$', urlconf_callables)
+    
+    def testNamedHandlers(self):
+        from views import empty_view
+        handler = (empty_view, {})
+        self.assertEqual(self.resolver.resolve404(), handler)
+        self.assertEqual(self.resolver.resolve500(), handler)
+
+    def testCallableHandlers(self):
+        from views import empty_view
+        handler = (empty_view, {})
+        self.assertEqual(self.callable_resolver.resolve404(), handler)
+        self.assertEqual(self.callable_resolver.resolve500(), handler)

tests/regressiontests/urlpatterns_reverse/urls_handlers_callable.py

@@ +1 @@
+from django.conf.urls.defaults import patterns
+from views import empty_view
+
+urlpatterns = patterns('')
+
+handler404 = empty_view
+handler500 = empty_view

tests/regressiontests/urlpatterns_reverse/urls_handlers.py

@@ +1 @@
+from django.conf.urls.defaults import patterns
+
+urlpatterns = patterns('')
+
+handler404 = 'regressiontests.urlpatterns_reverse.views.empty_view'
+handler500 = 'regressiontests.urlpatterns_reverse.views.empty_view'

docs/topics/http/urls.txt

@@ -244 +244 @@
 handler404
 ----------
 
-A string representing the full Python import path to the view that should be
-called if none of the URL patterns match.
+A callable, or a string representing the full Python import path to the view
+that should be called if none of the URL patterns match.
 
 By default, this is ``'django.views.defaults.page_not_found'``. That default
 value should suffice.
 
+.. versionchanged:: 1.2
+    Previous versions of Django only accepted strings representing import paths.
+
 handler500
 ----------
 
-A string representing the full Python import path to the view that should be
-called in case of server errors. Server errors happen when you have runtime
-errors in view code.
+A callable, or a string representing the full Python import path to the view
+that should be called in case of server errors. Server errors happen when you
+have runtime errors in view code.
 
 By default, this is ``'django.views.defaults.server_error'``. That default
 value should suffice.
 
+.. versionchanged:: 1.2
+    Previous versions of Django only accepted strings representing import paths.
+
 include
 -------