Remove django-1.10-get_form-form_class-default-value.patch which is wrong

Rewritten-From: 1d14b88a36824089b989453f7ce6f6189f2040cf

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 85453dab99701b28ab5e166873e86e86f5fe5a76..2037c75aa5e413866123c5b9349f575daee7c1f2 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -2,7 +2,6 @@ horizon (3:10.0.0~b2-2) UNRELEASED; urgency=medium
 
   * Add Django 1.10 patch:
     - django-1.10-django.conf.urls.patterns-removed.patch
-    - django-1.10-get_form-form_class-default-value.patch
     - django-1.10-define-TEMPLATES.patch
     - django-1.10-fix-wrong-django.conf.urls.url-call.patch
 

diff --git a/xenial/debian/patches/django-1.10-get_form-form_class-default-value.patch b/xenial/debian/patches/django-1.10-get_form-form_class-default-value.patch
deleted file mode 100644 (file)
index 0427ca7..0000000
--- a/xenial/debian/patches/django-1.10-get_form-form_class-default-value.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: [Django 1.10] get_form() form_class default value
- The backwards compatibility shim to allow FormMixin.get_form() to be defined
- with no default value for its form_class argument is removed.
-Author: Thomas Goirand <zigo@debian.org>
-Forwarded: no
-Last-Update: 2016-07-20
-
---- horizon-10.0.0~b2.orig/horizon/forms/views.py
-+++ horizon-10.0.0~b2/horizon/forms/views.py
-@@ -165,7 +165,7 @@ class ModalFormView(ModalFormMixin, view
-         """
-         return obj.name
- 
--    def get_form(self, form_class):
-+    def get_form(self, form_class=None):
-         """Returns an instance of the form to be used in this view."""
-         return form_class(self.request, **self.get_form_kwargs())
- 

diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
index 8b08b556e38f6d3d2d9b3db2bcea70ae651cf991..9230276ee9de0085b04f62bf68e1a84d42479640 100644 (file)
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -3,6 +3,5 @@ fix-dashboard-manage.patch
 fixed-horizon-MANIFEST.in.patch
 BaseCommand.option_list-is-gone-from-django1.10.patch
 django-1.10-django.conf.urls.patterns-removed.patch
-django-1.10-get_form-form_class-default-value.patch
-django-1.10-define-TEMPLATES.patch
 django-1.10-fix-wrong-django.conf.urls.url-call.patch
+django-1.10-define-TEMPLATES.patch