From 1620a14c86b338e819738d285eb3f6de8c5e7a28 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 19 Dec 2016 13:50:37 +0000 Subject: [PATCH 1/5] Require Django 1.9 instead of 1.8 - Legacy-Id: 12579 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 16aba8935..bc83c0882 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ coverage>=4.0.1,!=4.0.2 #cssselect>=0.6.1 # for PyQuery decorator>=3.4.0 defusedxml>=0.4.1 # for TastyPie when ussing xml; not a declared dependency -Django>=1.8.16,<1.9 +Django>=1.9,<1.10 django-bootstrap3>=5.1.1,<7.0.0 # django-bootstrap 7.0 requires django 1.8 django-formtools>=1.0 # instead of django.contrib.formtools in 1.8 django-markup>=1.1 From 7e3088993eae35beeed20af77bce4e933a5a32c9 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 19 Dec 2016 13:52:00 +0000 Subject: [PATCH 2/5] Delay an import which causes not ready complaints if handled too early. - Legacy-Id: 12580 --- ietf/settings_sqlitetest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ietf/settings_sqlitetest.py b/ietf/settings_sqlitetest.py index 5a9a10e31..149d896c6 100644 --- a/ietf/settings_sqlitetest.py +++ b/ietf/settings_sqlitetest.py @@ -17,13 +17,13 @@ debug.debug = True ## To be removed after upgrade to Django 1.8 ## -from django.db.migrations.loader import MIGRATIONS_MODULE_NAME class DisableMigrations(object): def __contains__(self, item): return True def __getitem__(self, item): + from django.db.migrations.loader import MIGRATIONS_MODULE_NAME # The string below is significant. It has to include the value of # django.db.migrations.loader.MIGRATIONS_MODULE_NAME. Used by django # 1.7 code in django.db.migrations.loader.MigrationLoader to From 244a7a96e469c4c9856e3043bf0fbf7ed2df9f0a Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 19 Dec 2016 13:52:58 +0000 Subject: [PATCH 3/5] Import import_module directly instead of through django, which is deprecated. - Legacy-Id: 12581 --- ietf/api/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ietf/api/__init__.py b/ietf/api/__init__.py index fa2601177..9a8819c4d 100644 --- a/ietf/api/__init__.py +++ b/ietf/api/__init__.py @@ -134,7 +134,7 @@ def autodiscover(): """ from django.conf import settings - from django.utils.importlib import import_module + from importlib import import_module from django.utils.module_loading import module_has_submodule for app in settings.INSTALLED_APPS: From faa7088d06eb49b0145e4972d26a66dead429561 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 19 Dec 2016 13:53:36 +0000 Subject: [PATCH 4/5] Adjusted an import path. - Legacy-Id: 12582 --- ietf/dbtemplate/template.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ietf/dbtemplate/template.py b/ietf/dbtemplate/template.py index f4276a9ef..40fb34bcb 100644 --- a/ietf/dbtemplate/template.py +++ b/ietf/dbtemplate/template.py @@ -4,7 +4,8 @@ from docutils.core import publish_string from docutils.utils import SystemMessage import debug # pyflakes:ignore -from django.template.base import Template as DjangoTemplate, TemplateDoesNotExist, TemplateEncodingError +from django.template.base import Template as DjangoTemplate, TemplateEncodingError +from django.template.exceptions import TemplateDoesNotExist from django.template.loader import BaseLoader from django.utils.encoding import smart_unicode From 0399ca5c35e0a728aeb556b79414d18e754058a9 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 19 Dec 2016 13:54:07 +0000 Subject: [PATCH 5/5] Adjusted an import path. - Legacy-Id: 12583 --- ietf/utils/templatetags/textfilters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ietf/utils/templatetags/textfilters.py b/ietf/utils/templatetags/textfilters.py index 58a00bedb..1ee5e20c4 100644 --- a/ietf/utils/templatetags/textfilters.py +++ b/ietf/utils/templatetags/textfilters.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from django.template.base import Library +from django.template.library import Library from django.template.defaultfilters import stringfilter from ietf.utils.text import xslugify as _xslugify