From 84ed3cfb40a64e64ddc32cc0df943cb12e198717 Mon Sep 17 00:00:00 2001 From: Étienne Loks 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/views_item.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ishtar_common/views_item.py') diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index fd7c2dc3e..9263ae92a 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -56,6 +56,7 @@ from django.http import HttpResponse, Http404 from django.shortcuts import render from django.template import loader from django.urls import reverse, NoReverseMatch +from django.utils import timezone from django.utils.translation import ( activate, deactivate, @@ -583,7 +584,6 @@ def show_item(model, name, extra_dct=None, model_for_perms=None, callback=None): dct["get_import_updated"] = item.get_imports_updated(request.user, limit=5) if hasattr(item, "history") and request.user.is_superuser: - if date: try: if not isinstance(date, datetime.datetime): @@ -3149,7 +3149,7 @@ def get_item( return HttpResponse(data, content_type="application/json") elif data_type == "csv": response = HttpResponse(content_type="text/csv", charset=ENCODING) - n = datetime.datetime.now() + n = timezone.now() filename = "%s_%s.csv" % (default_name, n.strftime("%Y%m%d-%H%M%S")) response["Content-Disposition"] = "attachment; filename=%s" % filename writer = csv.writer(response, **CSV_OPTIONS) @@ -3345,7 +3345,7 @@ def external_export(request, source_id, model_name, slug): return HttpResponse(lbl, status=response.status_code) response = HttpResponse(response.text, content_type="text/csv") - n = datetime.datetime.now() + n = timezone.now() filename = f"{model_name}-{n.strftime('%Y%m%d-%H%M%S')}.csv" response["Content-Disposition"] = "attachment; filename=%s" % filename return response -- cgit v1.2.3