From 5408b2d325120c2646f2f14bf459de7fa08988af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20K=C3=A1lm=C3=A1n?= <vkalman@consumeraffairs.com>
Date: Fri, 7 Feb 2025 22:41:58 +0100
Subject: [PATCH] removed unused deprecated ugettext imports

---
 .coveragerc           |  2 +-
 dbtemplates/admin.py  | 11 ++---------
 dbtemplates/apps.py   |  5 +----
 dbtemplates/models.py | 15 ++++++---------
 4 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index 1fa4289..3ae90e7 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -3,4 +3,4 @@ source = dbtemplates
 branch = 1
 
 [report]
-omit = *tests*,*migrations*
+omit = *tests*,*/migrations/*,test_*
diff --git a/dbtemplates/admin.py b/dbtemplates/admin.py
index 1c9095f..cac2dec 100644
--- a/dbtemplates/admin.py
+++ b/dbtemplates/admin.py
@@ -2,15 +2,8 @@ import posixpath
 from django import forms
 from django.contrib import admin
 from django.core.exceptions import ImproperlyConfigured
-try:
-    # Django 4.0
-    from django.utils.translation import gettext_lazy as _
-    from django.utils.translation import ngettext
-except ImportError:
-    # Before Django 4.0
-    from django.utils.translation import ugettext_lazy as _
-    from django.utils.translation import ungettext as ngettext
-
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext
 from django.utils.safestring import mark_safe
 
 from dbtemplates.conf import settings
diff --git a/dbtemplates/apps.py b/dbtemplates/apps.py
index 21141b3..3cf738d 100644
--- a/dbtemplates/apps.py
+++ b/dbtemplates/apps.py
@@ -1,8 +1,5 @@
 from django.apps import AppConfig
-try:
-    from django.utils.translation import ugettext_lazy as _
-except ImportError:
-    from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class DBTemplatesConfig(AppConfig):
diff --git a/dbtemplates/models.py b/dbtemplates/models.py
index f846b2b..24945ab 100644
--- a/dbtemplates/models.py
+++ b/dbtemplates/models.py
@@ -1,19 +1,16 @@
 from dbtemplates.conf import settings
-from dbtemplates.utils.cache import (add_template_to_cache,
-                                     remove_cached_template)
+from dbtemplates.utils.cache import (
+    add_template_to_cache,
+    remove_cached_template,
+)
 from dbtemplates.utils.template import get_template_source
+
 from django.contrib.sites.managers import CurrentSiteManager
 from django.contrib.sites.models import Site
 from django.db import models
 from django.db.models import signals
 from django.template import TemplateDoesNotExist
-try:
-    # Django >= 4.0
-    from django.utils.translation import gettext_lazy as _
-except ImportError:
-    # Django 3.2
-    from django.utils.translation import ugettext_lazy as _
-
+from django.utils.translation import gettext_lazy as _
 from django.utils.timezone import now