From 0b189b3cb20299f95b3ba15570feed7cb50b0168 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 11 Jan 2016 03:51:34 +0000 Subject: [PATCH] Added handle-django.forms.util-rename.patch. Rewritten-From: 74123cfbe7294bb3765c30a41e8e22feb6f0cbbe --- trusty/debian/changelog | 1 + .../handle-django.forms.util-rename.patch | 28 +++++++++++++++++++ trusty/debian/patches/series | 1 + 3 files changed, 30 insertions(+) create mode 100644 trusty/debian/patches/handle-django.forms.util-rename.patch diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 50c874b..e7f0172 100644 --- 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 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 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 +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 4b1c851..5a33f3e 100644 --- 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 -- 2.45.2