From 79fdfeb620c9b95ad44c34a22d5d661baa55bc92 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/tasks.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'ishtar_common/tasks.py')

diff --git a/ishtar_common/tasks.py b/ishtar_common/tasks.py
index 24ae02dcc..08f5dd10d 100644
--- a/ishtar_common/tasks.py
+++ b/ishtar_common/tasks.py
@@ -17,14 +17,11 @@
 
 # See the file COPYING for details.
 
-import datetime
-
 import os
 import sys
 
-from django.conf import settings
 from django.core.files import File
-from django.db.models import Q
+from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
 from ishtar_common.models_common import Town, Department
@@ -56,7 +53,7 @@ def launch_import(import_task_id):
         return
     if import_task.state != "S":
         return
-    import_task.launch_date = datetime.datetime.now()
+    import_task.launch_date = timezone.now()
     import_task.state = "P"
     import_task.save()
 
@@ -66,7 +63,7 @@ def launch_import(import_task_id):
         delete_existing=import_task.delete_before,
         release_locks=import_task.releasing_locks,
     )
-    import_task.finished_date = datetime.datetime.now()
+    import_task.finished_date = timezone.now()
     import_task.state = "F"
     import_task.save()
 
@@ -79,7 +76,7 @@ def launch_export(export_task_id):
         return
     if export_task.state != "S":
         return
-    export_task.launch_date = datetime.datetime.now()
+    export_task.launch_date = timezone.now()
     export_task.state = "P"
     export_task.save()
 
@@ -176,7 +173,7 @@ def launch_export(export_task_id):
     with open(archive_name, "rb") as result:
         export_task.result.save(archive_name.split(os.sep)[-1], File(result))
         os.remove(archive_name)
-        export_task.finished_date = datetime.datetime.now()
+        export_task.finished_date = timezone.now()
         export_task.state = "F"
         export_task.result_info = str(_("Export finished"))
         export_task.save()
-- 
cgit v1.2.3