summaryrefslogtreecommitdiff
path: root/ishtar_common/models_imports.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2025-03-27 14:47:12 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2025-06-13 18:08:06 +0200
commit84ed3cfb40a64e64ddc32cc0df943cb12e198717 (patch)
treed4220a3a19ee6ae31fbf281d7e0d35fb5b452cd1 /ishtar_common/models_imports.py
parentdb174e7f376a3687cb6cd84339592231ceae0ee0 (diff)
downloadIshtar-84ed3cfb40a64e64ddc32cc0df943cb12e198717.tar.bz2
Ishtar-84ed3cfb40a64e64ddc32cc0df943cb12e198717.zip
♻️ django: fix warnings for v5 - migrate to timezone aware dates
Diffstat (limited to 'ishtar_common/models_imports.py')
-rw-r--r--ishtar_common/models_imports.py29
1 files changed, 15 insertions, 14 deletions
diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py
index c588b9f0e..259128b7a 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
@@ -1519,7 +1520,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):
@@ -1539,7 +1540,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)
@@ -1671,12 +1672,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(
@@ -1691,7 +1692,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(
@@ -1707,7 +1708,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):
@@ -2218,7 +2219,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(
@@ -2550,7 +2551,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()
@@ -2565,7 +2566,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):
@@ -2577,13 +2578,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()
@@ -2646,7 +2647,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
@@ -2684,7 +2685,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"))
@@ -2724,7 +2725,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(