diff options
| author | Matt Deacalion Stevens <matt@dirtymonkey.co.uk> | 2015-09-21 15:50:55 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-09-21 14:00:31 -0400 |
| commit | 5023d63f8577d032ad3705448a672c40f025a014 (patch) | |
| tree | 5d1828700ed1bb272455fcb6b3d577d26f8ff22a /django | |
| parent | 63147dfa07cfed6c2aa2ad28b4a5664747650352 (diff) | |
[1.8.x] Corrected docstring in core.urlresolvers module.
The RegexURLResolver.resolve() method no longer returns a tuple.
It has returned a ResolverMatch object since commit e0fb90b2.
Backport of c07f9fef398a21a76d350e8b02b396b3e580b751 from master
Diffstat (limited to 'django')
| -rw-r--r-- | django/core/urlresolvers.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py index f7753cf092..f3caaa96c8 100644 --- a/django/core/urlresolvers.py +++ b/django/core/urlresolvers.py @@ -2,9 +2,8 @@ This module converts requested URLs to callback view functions. RegexURLResolver is the main class here. Its resolve() method takes a URL (as -a string) and returns a tuple in this format: - - (view_function, function_args, function_kwargs) +a string) and returns a ResolverMatch object which provides access to all +attributes of the resolved URL match. """ from __future__ import unicode_literals |