Merge pull request #73 from frabyn/django-4-compat

Django 4 compat

Author: timthelion

import_export_celery/admin_actions.py

@@ -2,7 +2,7 @@
 import json
 from uuid import UUID
 
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext_lazy as _
 from django.urls import reverse
 from django.shortcuts import redirect
 

import_export_celery/models/exportjob.py

@@ -10,7 +10,7 @@
 from django.dispatch import receiver
 
 from django.db.models.signals import post_save
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from import_export.formats.base_formats import DEFAULT_FORMATS
 

import_export_celery/tasks.py

@@ -10,8 +10,8 @@
 from django.core.mail import send_mail
 
 from django.urls import reverse
-from django.utils.encoding import force_text
-from django.utils.translation import ugettext as _
+from django.utils.encoding import force_str
+from django.utils.translation import gettext_lazy as _
 
 from import_export.formats.base_formats import DEFAULT_FORMATS
 
@@ -56,7 +56,7 @@ def _run_import_job(import_job, dry_run=True):
     try:
         data = import_job.file.read()
         if not import_format.is_binary():
-            data = force_text(data, "utf8")
+            data = force_str(data, "utf8")
         dataset = import_format.create_dataset(data)
     except UnicodeDecodeError as e:
         import_job.errors += _("Imported file has a wrong encoding: %s" % e) + "\n"