Added handle-django.forms.util-rename.patch.

Rewritten-From: 74123cfbe7294bb3765c30a41e8e22feb6f0cbbe

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 50c874b33d77feb55c84ac781166555d29c25c38..e7f0172d16f90dad9412d33c9ea275dc49b5210a 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -4,6 +4,7 @@ horizon (2:8.0.0-4) unstable; urgency=medium
   * Added do-not-use-importlib-from-django.patch.
   * Added do-not-use-django.utils.unittest.patch.
   * Added fixed-removed-TemplateDoesNotExist.patch.
+  * Added handle-django.forms.util-rename.patch.
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 11 Jan 2016 02:54:28 +0000
 

diff --git a/trusty/debian/patches/handle-django.forms.util-rename.patch b/trusty/debian/patches/handle-django.forms.util-rename.patch
new file mode 100644 (file)
index 0000000..d364941
--- /dev/null
+++ b/trusty/debian/patches/handle-django.forms.util-rename.patch
@@ -0,0 +1,28 @@
+Description: Handle django.forms.util rename
+ In Django 1.9, django.forms.util is now renamed as django.forms.utils.
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2016-01-11
+
+--- horizon-8.0.0.orig/horizon/forms/fields.py
++++ horizon-8.0.0/horizon/forms/fields.py
+@@ -20,7 +20,7 @@ import six
+ from django.core.exceptions import ValidationError  # noqa
+ from django.core import urlresolvers
+ from django.forms import fields
+-from django.forms.util import flatatt  # noqa
++from django.forms.utils import flatatt  # noqa
+ from django.forms import widgets
+ from django.utils.encoding import force_text
+ from django.utils.functional import Promise  # noqa
+--- horizon-8.0.0.orig/horizon/utils/html.py
++++ horizon-8.0.0/horizon/utils/html.py
+@@ -12,7 +12,7 @@
+ 
+ import copy
+ 
+-from django.forms.util import flatatt  # noqa
++from django.forms.utils import flatatt  # noqa
+ 
+ 
+ class HTMLElement(object):

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 4b1c8511c16e1bcc5da3094809b34a18136fecbd..5a33f3e6cbb1ed40bc4fa1ead9cbc3a1910ce725 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -5,3 +5,4 @@ do-not-use-importlib-from-django.patch
 do-not-use-django.utils.log.NullHandler.patch
 do-not-use-django.utils.unittest.patch
 fixed-removed-TemplateDoesNotExist.patch
+handle-django.forms.util-rename.patch