From e1e11c42cb284d38ef4115456fc81e767eed9494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Wed, 15 Jun 2022 14:25:32 +0200 Subject: [PATCH] Django 4.x fixes --- dbtemplates/admin.py | 5 ++++- dbtemplates/models.py | 6 +++++- dbtemplates/utils/cache.py | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dbtemplates/admin.py b/dbtemplates/admin.py index 4ce3e34..2e4486c 100644 --- a/dbtemplates/admin.py +++ b/dbtemplates/admin.py @@ -2,7 +2,10 @@ import posixpath from django import forms from django.contrib import admin from django.core.exceptions import ImproperlyConfigured -from django.utils.translation import ungettext, ugettext_lazy as _ +try: + from django.utils.translation import ungettext, ugettext_lazy as _ +except ImportError: + from django.utils.translation import ngettext, gettext_lazy as _ from django.utils.safestring import mark_safe from dbtemplates.conf import settings diff --git a/dbtemplates/models.py b/dbtemplates/models.py index 10cb83c..f201ce4 100644 --- a/dbtemplates/models.py +++ b/dbtemplates/models.py @@ -8,7 +8,11 @@ from django.contrib.sites.models import Site from django.db import models from django.db.models import signals from django.template import TemplateDoesNotExist -from django.utils.translation import ugettext_lazy as _ +try: + from django.utils.translation import ugettext_lazy as _ +except ImportError: + from django.utils.translation import gettext_lazy as _ + from django.utils.timezone import now diff --git a/dbtemplates/utils/cache.py b/dbtemplates/utils/cache.py index 53f0078..ddf37a6 100644 --- a/dbtemplates/utils/cache.py +++ b/dbtemplates/utils/cache.py @@ -10,7 +10,7 @@ def get_cache_backend(): """ Compatibilty wrapper for getting Django's cache backend instance """ - if django.VERSION[0] >= 3 and django.VERSION[1] >= 2: + if (django.VERSION[0] >= 3 and django.VERSION[1] >= 2) or django.VERSION[0] >= 4: from django.core.cache import caches cache = caches.create_connection(settings.DBTEMPLATES_CACHE_BACKEND) else: