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

Regression in 8b93b31487d6d3b0fcbbd0498991ea0db9088054.

Thanks rcoup for the report.

Backport of 3c06b2f2a3 from master

6 files changed, 50 insertions, 1 deletions

diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py
index 17cad51db5..264a9e984f 100644
--- a/django/core/urlresolvers.py
+++ b/django/core/urlresolvers.py
@@ -8,6 +8,8 @@ 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
 
@@ -269,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 0000000000..561125a2d0
--- /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 <http://code.djangoproject.com/ticket/22486>`_)
diff --git a/docs/releases/1.5.7.txt b/docs/releases/1.5.7.txt
new file mode 100644
index 0000000000..c6987e3e5b
--- /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 <http://code.djangoproject.com/ticket/22486>`_)
diff --git a/docs/releases/index.txt b/docs/releases/index.txt
index 5507b8e928..44e650892f 100644
--- a/docs/releases/index.txt
+++ b/docs/releases/index.txt
@@ -22,6 +22,7 @@ Final releases
 .. toctree::
    :maxdepth: 1
 
+   1.5.7
    1.5.6
    1.5.5
    1.5.4
@@ -35,6 +36,7 @@ Final releases
 .. toctree::
    :maxdepth: 1
 
+   1.4.12
    1.4.11
    1.4.10
    1.4.9
diff --git a/tests/regressiontests/urlpatterns_reverse/urls.py b/tests/regressiontests/urlpatterns_reverse/urls.py
index 2af306b597..7aae7c4691 100644
--- a/tests/regressiontests/urlpatterns_reverse/urls.py
+++ b/tests/regressiontests/urlpatterns_reverse/urls.py
@@ -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'),
diff --git a/tests/regressiontests/urlpatterns_reverse/views.py b/tests/regressiontests/urlpatterns_reverse/views.py
index f8148e1f3e..dd1d97c700 100644
--- a/tests/regressiontests/urlpatterns_reverse/views.py
+++ b/tests/regressiontests/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
@@ -45,3 +47,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,
+)