Commit b91c385e authored by Tim Graham's avatar Tim Graham
Browse files

[1.4.x] Fixed #22486 -- Restored the ability to reverse views created using functools.partial. 

Regression in 8b93b314.

Thanks rcoup for the report.

Backport of 3c06b2f2 from master
parent 1edb1635

django/core/urlresolvers.py

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ a string) and returns a tuple in this format: 
    (view_function, function_args, function_kwargs)

"""



import functools

import re

from threading import local
@@ -248,6 +249,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:

docs/releases/1.4.12.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
===========================

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 <http://code.djangoproject.com/ticket/22486>`_)

docs/releases/index.txt

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ Final releases 
.. toctree::

   :maxdepth: 1



   1.4.12

   1.4.11

   1.4.10

   1.4.9

tests/regressiontests/urlpatterns_reverse/urls.py

+5 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ from __future__ import absolute_import 


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 = patterns('',
@@ -56,6 +56,10 @@ urlpatterns = patterns('', 
    # This is non-reversible, but we shouldn't blow up when parsing it.

    url(r'^(?:foo|bar)(\w+)/$', empty_view, name="disjunction"),



    # Partials should be fine.

    url(r'^partial/', empty_view_partial, name="partial"),

    url(r'^partial_wrapped/', empty_view_wrapped, name="partial_wrapped"),



    # Regression views for #9038. See tests for more details

    url(r'arg_view/$', 'kwargs_view'),

    url(r'arg_view/(?P<arg1>\d+)/$', 'kwargs_view'),

tests/regressiontests/urlpatterns_reverse/views.py

+10 −0
Original line number Diff line number Diff line 
from functools import partial, update_wrapper



from django.http import HttpResponse

from django.views.generic import RedirectView

from django.core.urlresolvers import reverse_lazy
@@ -40,3 +42,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,

)