From 6016193d331526883036a3d6609f9570e8d17382 Mon Sep 17 00:00:00 2001 From: DylannCordel <cordel.d@free.fr> Date: Wed, 23 Oct 2019 19:41:32 +0200 Subject: [PATCH] compat django 2.2 --- newsbox/__init__.py | 2 +- newsbox/admin.py | 5 ++++- newsbox/models.py | 5 ++++- newsbox_cms/admin.py | 5 ++++- newsbox_i18n/models.py | 5 ++++- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/newsbox/__init__.py b/newsbox/__init__.py index 855b6f7..5d628e3 100644 --- a/newsbox/__init__.py +++ b/newsbox/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -__version__ = '0.6.10' +__version__ = '0.6.11' diff --git a/newsbox/admin.py b/newsbox/admin.py index 6de7a19..42cc607 100644 --- a/newsbox/admin.py +++ b/newsbox/admin.py @@ -8,7 +8,10 @@ from django.contrib import messages, admin from django.contrib.admin.models import LogEntry, CHANGE from django.contrib.admin.templatetags.admin_static import static from django.contrib.contenttypes.models import ContentType -from django.core.urlresolvers import reverse +try: + from django.urls import reverse +except ImportError: + from django.core.urlresolvers import reverse from django.http import HttpResponseForbidden, HttpResponseRedirect from django.shortcuts import get_object_or_404 from django.utils.translation import ugettext_lazy as _, ungettext_lazy diff --git a/newsbox/models.py b/newsbox/models.py index 9ff9822..f2137eb 100644 --- a/newsbox/models.py +++ b/newsbox/models.py @@ -8,7 +8,10 @@ import sys from warnings import warn # "Django imports" -from django.core.urlresolvers import reverse +try: + from django.urls import reverse +except ImportError: + from django.core.urlresolvers import reverse from django.db import models from django.utils import six from django.utils.encoding import python_2_unicode_compatible diff --git a/newsbox_cms/admin.py b/newsbox_cms/admin.py index 7a84ba4..fa11b7f 100644 --- a/newsbox_cms/admin.py +++ b/newsbox_cms/admin.py @@ -2,7 +2,10 @@ from __future__ import unicode_literals from django.contrib import admin -from django.core.urlresolvers import reverse +try: + from django.urls import reverse +except ImportError: + from django.core.urlresolvers import reverse from django.utils import formats from django.utils.translation import ugettext_lazy as _ from django.utils import six diff --git a/newsbox_i18n/models.py b/newsbox_i18n/models.py index 8147e98..aaa9b13 100644 --- a/newsbox_i18n/models.py +++ b/newsbox_i18n/models.py @@ -1,7 +1,10 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.core.urlresolvers import reverse +try: + from django.urls import reverse +except ImportError: + from django.core.urlresolvers import reverse from django.utils.translation import ugettext_lazy as _, get_language from django.utils import six from django.utils.encoding import python_2_unicode_compatible -- GitLab