Update debian/patches/django-1.10-fix-wrong-django.conf.urls.url-call.patch

Rewritten-From: 7cd65bc361de67110973bba6db510c819b265109

diff --git a/xenial/debian/patches/django-1.10-fix-wrong-django.conf.urls.url-call.patch b/xenial/debian/patches/django-1.10-fix-wrong-django.conf.urls.url-call.patch
index b8a910cf0116c9573ac0d4959db66da78d571f07..ef4a7bab0eafca0179f924d1f6f849271f8b85e3 100644 (file)
--- a/xenial/debian/patches/django-1.10-fix-wrong-django.conf.urls.url-call.patch
+++ b/xenial/debian/patches/django-1.10-fix-wrong-django.conf.urls.url-call.patch
@@ -1,17 +1,44 @@
 Description: Fix wrong django.conf.urls.url call
 Author: Thomas Goirand <zigo@debian.org>
 Forwarded: no
+X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fhorizon.git;a=commitdiff_plain;h=9420b114763ce27a916f7318c9e23dcaa12392ef
+Origin: upstream, https://review.openstack.org/#/c/345259/
 Last-Update: 2016-07-20
+Change-Id: I208878ba5b386217879ce571e63d6cb84808da55
+Partially-Implements: blueprint dj110
 
---- horizon-10.0.0~b2.orig/horizon/test/urls.py
-+++ horizon-10.0.0~b2/horizon/test/urls.py
-@@ -31,8 +31,7 @@ from horizon.test.jasmine import jasmine
+diff --git a/horizon/test/urls.py b/horizon/test/urls.py
+index 82939fb..310c981 100644
+--- a/horizon/test/urls.py
++++ b/horizon/test/urls.py
+@@ -20,20 +20,27 @@
+ URL patterns for testing Horizon views.
+ """
+ 
++import django
+ from django.conf.urls import include
+ from django.conf.urls import url
++from django.contrib.auth import views
+ from django.contrib.staticfiles.urls import staticfiles_urlpatterns  # noqa
+ from django.views.generic import TemplateView  # noqa
+ 
+ import horizon
+ from horizon.test.jasmine import jasmine
+ 
++auth_url = url(r"auth/login/", "django.contrib.auth.views.login",
++               {'template_name': "auth/login.html"})
++
++if django.VERSION >= (1, 10):
++    auth_url = url(r"auth/login/",
++                   views.LoginView.as_view(template_name="auth/login.html"),
++                   name='login'),
  
  urlpatterns = [
      url(r'', include(horizon.urls)),
 -    url(r"auth/login/", "django.contrib.auth.views.login",
 -        {'template_name': "auth/login.html"},
-+    url(r"auth/login/", TemplateView.as_view(template_name="auth/login.html"),
-         name='login'),
+-        name='login'),
++    auth_url,
      url(r'auth/', include('django.contrib.auth.urls')),
      url(r'^jasmine/.*?$', jasmine.dispatcher),
+     url(r'^jasmine-legacy/$',