Added do-not-use-importlib-from-django.patch.

Rewritten-From: 2d242a624817e086a939b6b49b7c88c59e3474fe

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 18ac2848daaa476730635e72afef954850dc7344..6459e9900f283b7bcc2c46251afbba1a37c43f2b 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+horizon (2:8.0.0-4) unstable; urgency=medium
+
+  * Added do-not-use-importlib-from-django.patch.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 11 Jan 2016 02:54:28 +0000
+
 horizon (2:8.0.0-3) unstable; urgency=medium
 
   * Updated pt.po debconf translation (Closes: #802419).

diff --git a/trusty/debian/patches/do-not-use-importlib-from-django.patch b/trusty/debian/patches/do-not-use-importlib-from-django.patch
new file mode 100644 (file)
index 0000000..e810d12
--- /dev/null
+++ b/trusty/debian/patches/do-not-use-importlib-from-django.patch
@@ -0,0 +1,84 @@
+Description: Do not use importlib from django
+ django.utils.importlib has been removed from Django 1.9
+Author: Thomas Goirand <zigo@debian.org>
+Bug-Debian: https://bugs.debian.org/809575
+Forwarded: no
+Last-Update: 2016-01-11
+
+--- horizon-8.0.0.orig/horizon/base.py
++++ horizon-8.0.0/horizon/base.py
+@@ -34,7 +34,7 @@ from django.core.exceptions import Impro
+ from django.core.urlresolvers import reverse
+ from django.utils.encoding import python_2_unicode_compatible
+ from django.utils.functional import SimpleLazyObject  # noqa
+-from django.utils.importlib import import_module  # noqa
++from importlib import import_module  # noqa
+ from django.utils.module_loading import module_has_submodule  # noqa
+ from django.utils.translation import ugettext_lazy as _
+ import six
+--- horizon-8.0.0.orig/horizon/management/commands/startdash.py
++++ horizon-8.0.0/horizon/management/commands/startdash.py
+@@ -16,7 +16,7 @@ import os
+ 
+ from django.core.management.base import CommandError  # noqa
+ from django.core.management.templates import TemplateCommand  # noqa
+-from django.utils.importlib import import_module  # noqa
++from importlib import import_module  # noqa
+ 
+ import horizon
+ 
+--- horizon-8.0.0.orig/horizon/management/commands/startpanel.py
++++ horizon-8.0.0/horizon/management/commands/startpanel.py
+@@ -16,7 +16,7 @@ import os
+ 
+ from django.core.management.base import CommandError  # noqa
+ from django.core.management.templates import TemplateCommand  # noqa
+-from django.utils.importlib import import_module  # noqa
++from importlib import import_module  # noqa
+ 
+ import horizon
+ 
+--- horizon-8.0.0.orig/horizon/test/tests/base.py
++++ horizon-8.0.0/horizon/test/tests/base.py
+@@ -21,7 +21,7 @@ from django.conf import settings
+ from django.contrib.auth.models import User  # noqa
+ from django.core.exceptions import ImproperlyConfigured  # noqa
+ from django.core import urlresolvers
+-from django.utils.importlib import import_module  # noqa
++from importlib import import_module  # noqa
+ from six import moves
+ 
+ import six
+--- horizon-8.0.0.orig/horizon/workflows/base.py
++++ horizon-8.0.0/horizon/workflows/base.py
+@@ -24,7 +24,7 @@ from django.template.defaultfilters impo
+ from django.template.defaultfilters import safe  # noqa
+ from django.template.defaultfilters import slugify  # noqa
+ from django.utils.encoding import force_text
+-from django.utils.importlib import import_module  # noqa
++from importlib import import_module  # noqa
+ from django.utils.translation import ugettext_lazy as _
+ import six
+ 
+--- horizon-8.0.0.orig/openstack_dashboard/test/helpers.py
++++ horizon-8.0.0/openstack_dashboard/test/helpers.py
+@@ -31,7 +31,7 @@ from django.core.handlers import wsgi
+ from django.core import urlresolvers
+ from django.test.client import RequestFactory  # noqa
+ from django.test import utils as django_test_utils
+-from django.utils.importlib import import_module  # noqa
++from importlib import import_module  # noqa
+ from django.utils import unittest
+ import glanceclient
+ from heatclient import client as heat_client
+--- horizon-8.0.0.orig/openstack_dashboard/utils/settings.py
++++ horizon-8.0.0/openstack_dashboard/utils/settings.py
+@@ -15,7 +15,7 @@ import logging
+ import os
+ import pkgutil
+ 
+-from django.utils import importlib
++import importlib
+ import six
+ 
+ from horizon.utils import file_discovery as fd

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index e883b0358c2035eff2581538e242ec72baf1c5fe..7f5f2d2e45d485bc267e6e82861cda7714a17be6 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1,3 +1,4 @@
 fix-dashboard-django-wsgi.patch
 fix-dashboard-manage.patch
 fixed-horizon-MANIFEST.in.patch
+do-not-use-importlib-from-django.patch