From 013de7fe1fc8d12bf704a1a8d72e4b4885b4135a Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 11 Sep 2024 11:06:50 +0100 Subject: [PATCH] Replace pytz by zoneinfo --- django_datadog_logger/formatters/datadog.py | 10 ++++++++-- requirements.txt | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/django_datadog_logger/formatters/datadog.py b/django_datadog_logger/formatters/datadog.py index eb44d66..9155661 100644 --- a/django_datadog_logger/formatters/datadog.py +++ b/django_datadog_logger/formatters/datadog.py @@ -4,8 +4,12 @@ import typing from logging import LogRecord +try: + import zoneinfo +except ImportError: + from backports import zoneinfo + import json_log_formatter -import pytz from django.conf import settings from django.core.exceptions import DisallowedHost from django.http.request import split_domain_port, HttpRequest @@ -77,7 +81,9 @@ def json_record(self, message: str, extra: typing.Dict, record: LogRecord) -> ty "logger.name": record.name, "logger.thread_name": record.threadName, "logger.method_name": record.funcName, - "date": pytz.utc.localize(datetime.datetime.utcfromtimestamp(record.created)).isoformat(), + "date": ( + datetime.datetime.utcfromtimestamp(record.created).replace(tzinfo=zoneinfo.ZoneInfo("UTC")).isoformat() + ), "status": record.levelname, } diff --git a/requirements.txt b/requirements.txt index 6a6a810..0c65ada 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ JSON-log-formatter Django djangorestframework -pytz +backports.zoneinfo;python_version<"3.9"