Skip to content
Browse files

[1.6.x] Fixed #21044 -- Documented django.core.urlresolvers.Resolver404

Thanks Keryn Knight for the suggestion.

Backport of eacf060 from master
  • Loading branch information...
1 parent 622d5c7 commit 1dd061ad7705d2851bee5e78b9fed381130ec5f4 @timgraham timgraham committed
Showing with 12 additions and 2 deletions.
  1. +9 −0 docs/ref/exceptions.txt
  2. +3 −2 docs/ref/urlresolvers.txt
9 docs/ref/exceptions.txt
@@ -131,6 +131,15 @@ URL Resolver exceptions
URL Resolver exceptions are defined in :mod:`django.core.urlresolvers`.
+.. exception:: Resolver404
+ The :exc:`Resolver404` exception is raised by
+ :func:`django.core.urlresolvers.resolve()` if the path passed to
+ ``resolve()`` doesn't map to a view. It's a subclass of
+ :class:`django.http.Http404`
.. exception:: NoReverseMatch
5 docs/ref/urlresolvers.txt
@@ -102,8 +102,9 @@ worry about the ``urlconf`` parameter. The function returns a
:class:`ResolverMatch` object that allows you
to access various meta-data about the resolved URL.
-If the URL does not resolve, the function raises an
-:class:`~django.http.Http404` exception.
+If the URL does not resolve, the function raises a
+:exc:`~django.core.urlresolvers.Resolver404` exception (a subclass of
+:class:`~django.http.Http404`) .
.. class:: ResolverMatch

0 comments on commit 1dd061a

Please sign in to comment.
Something went wrong with that request. Please try again.