From eda40f3481b6963163a04cc393db2bb95d3c5242 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 27 Mar 2025 14:47:12 +0100
Subject: ♻️  django: fix warnings for v5 - migrate to timezone aware dates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ishtar_common/models_imports.py | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'ishtar_common/models_imports.py')

diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py
index 5c8379255..e480fd606 100644
--- a/ishtar_common/models_imports.py
+++ b/ishtar_common/models_imports.py
@@ -52,6 +52,7 @@ from django.db.models import Q
 from django.db.models.base import ModelBase
 from django.db.models.signals import pre_delete
 from django.template.defaultfilters import slugify
+from django.utils import timezone
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
 
@@ -1536,7 +1537,7 @@ class BaseImport(models.Model, OwnPerms, SheetItem):
 
     def archive(self):
         self.state = "AC"
-        self.end_date = datetime.datetime.now()
+        self.end_date = timezone.now()
         self._archive()
 
     def unarchive(self, state):
@@ -1556,7 +1557,7 @@ class BaseImport(models.Model, OwnPerms, SheetItem):
             "info",
         )
         self.state = "IQ"
-        self.end_date = datetime.datetime.now()
+        self.end_date = timezone.now()
         self.save()
         if self.SLUG == "import":
             return delayed_import.delay(self.pk)
@@ -1688,12 +1689,12 @@ class ImportGroup(BaseImport):
 
     def initialize(self, user=None, session_key=None):
         self.state = "AP"
-        self.end_date = datetime.datetime.now()
+        self.end_date = timezone.now()
         self.save()
         for imp in self.imports.all():
             imp.initialize(user, session_key)
         self.state = "A"
-        self.end_date = datetime.datetime.now()
+        self.end_date = timezone.now()
         self.save()
 
     def importation(
@@ -1708,7 +1709,7 @@ class ImportGroup(BaseImport):
         if not q.count():
             return
         self.state = "IP"
-        self.end_date = datetime.datetime.now()
+        self.end_date = timezone.now()
         self.save()
         first = self.import_list()[0]
         first.importation(
@@ -1724,7 +1725,7 @@ class ImportGroup(BaseImport):
             self.state = "FE"
         else:
             self.state = "F"
-        self.end_date = datetime.datetime.now()
+        self.end_date = timezone.now()
         self.save()
 
     def _unarchive(self):
@@ -2235,7 +2236,7 @@ class Import(BaseImport):
             data.to_csv(filename, index=False, columns=data.columns[range(last_column)],
                         float_format=np_format_int_float)
         except IndexError:
-            error_file = f"{slugify(self.name)}_errors_{datetime.datetime.now().strftime('%Y-%m-%d-%H%M')}.csv"
+            error_file = f"{slugify(self.name)}_errors_{timezone.now().strftime('%Y-%m-%d-%H%M')}.csv"
             error = str(_("Error while opening the file. Particularly check the number of columns of your file."))
             csv_file = f"line,error\n-,{error}"
             self.error_file.save(
@@ -2567,7 +2568,7 @@ class Import(BaseImport):
 
     def initialize(self, user=None, session_key=None):
         self.state = "AP"
-        self.end_date = datetime.datetime.now()
+        self.end_date = timezone.now()
         if user and not self.user:
             self.user = user
         self.save()
@@ -2582,7 +2583,7 @@ class Import(BaseImport):
             self.save()
             return
         self.state = "A"
-        self.end_date = datetime.datetime.now()
+        self.end_date = timezone.now()
         self.save()
 
     def delayed_check_modified(self, session_key):
@@ -2594,13 +2595,13 @@ class Import(BaseImport):
             "info",
         )
         self.state = "HQ"
-        self.end_date = datetime.datetime.now()
+        self.end_date = timezone.now()
         self.save()
         return delayed_check.delay(self.pk)
 
     def check_modified(self, session_key=None):
         self.state = "HP"
-        self.end_date = datetime.datetime.now()
+        self.end_date = timezone.now()
         self.changed_line_numbers = ""
         self.changed_checked = False
         self.save()
@@ -2663,7 +2664,7 @@ class Import(BaseImport):
         verbose=False
     ):
         self.state = "IP"
-        self.end_date = datetime.datetime.now()
+        self.end_date = timezone.now()
         if not line_to_process:  # full import
             self.imported_line_numbers = ""
             self.current_line = 0
@@ -2701,7 +2702,7 @@ class Import(BaseImport):
             return importer, None
         # result file
         filename = slugify(self.importer_type.name)
-        now = datetime.datetime.now().isoformat("-").replace(":", "")
+        now = timezone.now().isoformat("-").replace(":", "")
         result_file = filename + "_result_%s.csv" % now
         self.result_file.save(
             result_file, ContentFile(importer.get_csv_result().encode("utf-8"))
@@ -2741,7 +2742,7 @@ class Import(BaseImport):
             self.match_file.save(
                 match_file, ContentFile(importer.get_csv_matches().encode("utf-8"))
             )
-        self.end_date = datetime.datetime.now()
+        self.end_date = timezone.now()
         self.save()
         if self.next_import and not importer.errors:
             return self.next_import.importation(
-- 
cgit v1.2.3