From 3c06b2f2a341922db4294b91117c7b1c34119a8c Mon Sep 17 00:00:00 2001 From: Preston Timmons Date: Tue, 22 Apr 2014 20:19:46 +0000 Subject: [PATCH] Fixed #22486 -- Restored the ability to reverse views created using functools.partial. Regression in 8b93b31487d6d3b0fcbbd0498991ea0db9088054. Thanks rcoup for the report. --- django/core/urlresolvers.py | 4 ++++ docs/releases/1.4.12.txt | 14 ++++++++++++++ docs/releases/1.5.7.txt | 14 ++++++++++++++ docs/releases/1.6.4.txt | 4 ++++ docs/releases/index.txt | 2 ++ tests/urlpatterns_reverse/urls.py | 6 +++++- tests/urlpatterns_reverse/views.py | 10 ++++++++++ 7 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 docs/releases/1.4.12.txt create mode 100644 docs/releases/1.5.7.txt diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py index eebe54e99be..8ca602c2414 100644 --- a/django/core/urlresolvers.py +++ b/django/core/urlresolvers.py @@ -8,6 +8,7 @@ a string) and returns a tuple in this format: """ from __future__ import unicode_literals +import functools from importlib import import_module import re from threading import local @@ -270,6 +271,9 @@ class RegexURLResolver(LocaleRegexProvider): self._callback_strs.add(pattern._callback_str) elif hasattr(pattern, '_callback'): callback = pattern._callback + if isinstance(callback, functools.partial): + callback = callback.func + if not hasattr(callback, '__name__'): lookup_str = callback.__module__ + "." + callback.__class__.__name__ else: diff --git a/docs/releases/1.4.12.txt b/docs/releases/1.4.12.txt new file mode 100644 index 00000000000..561125a2d06 --- /dev/null +++ b/docs/releases/1.4.12.txt @@ -0,0 +1,14 @@ +=========================== +Django 1.4.12 release notes +=========================== + +*Under development* + +Django 1.4.12 fixes a regression in the 1.4.11 security release. + +Bugfixes +======== + +* Restored the ability to :meth:`~django.core.urlresolvers.reverse` views + created using :func:`functools.partial()` + (`#22486 `_) diff --git a/docs/releases/1.5.7.txt b/docs/releases/1.5.7.txt new file mode 100644 index 00000000000..c6987e3e5b0 --- /dev/null +++ b/docs/releases/1.5.7.txt @@ -0,0 +1,14 @@ +========================== +Django 1.5.7 release notes +========================== + +*Under development* + +Django 1.5.7 fixes a regression in the 1.5.6 security release. + +Bugfixes +======== + +* Restored the ability to :meth:`~django.core.urlresolvers.reverse` views + created using :func:`functools.partial()` + (`#22486 `_) diff --git a/docs/releases/1.6.4.txt b/docs/releases/1.6.4.txt index 6bf0b6fef00..fd36b212719 100644 --- a/docs/releases/1.6.4.txt +++ b/docs/releases/1.6.4.txt @@ -12,3 +12,7 @@ Bugfixes * Added backwards compatibility support for the :mod:`django.contrib.messages` cookie format of Django 1.4 and earlier to facilitate upgrading to 1.6 from 1.4 (`#22426 `_). + +* Restored the ability to :meth:`~django.core.urlresolvers.reverse` views + created using :func:`functools.partial()` + (`#22486 `_) diff --git a/docs/releases/index.txt b/docs/releases/index.txt index d6c0ac028df..104c85a10c9 100644 --- a/docs/releases/index.txt +++ b/docs/releases/index.txt @@ -47,6 +47,7 @@ Final releases .. toctree:: :maxdepth: 1 + 1.5.7 1.5.6 1.5.5 1.5.4 @@ -60,6 +61,7 @@ Final releases .. toctree:: :maxdepth: 1 + 1.4.12 1.4.11 1.4.10 1.4.9 diff --git a/tests/urlpatterns_reverse/urls.py b/tests/urlpatterns_reverse/urls.py index d7dd6b6b09e..05b925d1d51 100644 --- a/tests/urlpatterns_reverse/urls.py +++ b/tests/urlpatterns_reverse/urls.py @@ -2,7 +2,7 @@ import warnings from django.conf.urls import patterns, url, include -from .views import empty_view, absolute_kwargs_view +from .views import empty_view, empty_view_partial, empty_view_wrapped, absolute_kwargs_view other_patterns = [ @@ -54,6 +54,10 @@ with warnings.catch_warnings(record=True): url(r'^outer-no-kwargs/([0-9]+)/', include('urlpatterns_reverse.included_no_kwargs_urls')), url('', include('urlpatterns_reverse.extra_urls')), + # Partials should be fine. + url(r'^partial/', empty_view_partial, name="partial"), + url(r'^partial_wrapped/', empty_view_wrapped, name="partial_wrapped"), + # This is non-reversible, but we shouldn't blow up when parsing it. url(r'^(?:foo|bar)(\w+)/$', empty_view, name="disjunction"), diff --git a/tests/urlpatterns_reverse/views.py b/tests/urlpatterns_reverse/views.py index 610feb84518..efd5689c313 100644 --- a/tests/urlpatterns_reverse/views.py +++ b/tests/urlpatterns_reverse/views.py @@ -1,3 +1,5 @@ +from functools import partial, update_wrapper + from django.http import HttpResponse from django.views.generic import RedirectView from django.core.urlresolvers import reverse_lazy @@ -55,3 +57,11 @@ def login_required_view(request): def bad_view(request, *args, **kwargs): raise ValueError("I don't think I'm getting good value for this view") + + +empty_view_partial = partial(empty_view, template_name="template.html") + + +empty_view_wrapped = update_wrapper( + partial(empty_view, template_name="template.html"), empty_view, +)