summaryrefslogtreecommitdiff
path: root/docs/topics/http
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2009-12-13 20:29:04 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2009-12-13 20:29:04 +0000
commit1c5fe467bd838c8521ca7c7427d8196f08a24f80 (patch)
tree04aacaead4397dc687ace013cf51bb84c3c6571d /docs/topics/http
parent125403ca972d4964691ee206acc6c28c0b3eab9d (diff)
Fixed #10326: handler500 and handler404 may now be callables. Thanks, dcwatson, adurdin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/topics/http')
-rw-r--r--docs/topics/http/urls.txt16
1 files changed, 11 insertions, 5 deletions
diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt
index fd45e79876..0a5d04cdae 100644
--- a/docs/topics/http/urls.txt
+++ b/docs/topics/http/urls.txt
@@ -253,24 +253,30 @@ handler404
.. data:: 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
----------
.. data:: 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
-------