From 100406a2881eb31656135d0924bd3f029d8aff15 Mon Sep 17 00:00:00 2001 From: Jair Henrique Date: Fri, 20 Dec 2024 13:52:30 -0300 Subject: [PATCH] Remove deprecation warning of datetime.datetime.utcfromtimestamp. --- CHANGELOG.md | 1 + model_bakery/timezone.py | 4 ++-- model_bakery/utils.py | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 287d14ab..e3b70a7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Changed ### Removed +- Remove deprecation warning of `datetime.datetime.utcfromtimestamp`. ## [1.20.0](https://pypi.org/project/model-bakery/1.20.0/) diff --git a/model_bakery/timezone.py b/model_bakery/timezone.py index 74ad9b0f..815cd8c7 100644 --- a/model_bakery/timezone.py +++ b/model_bakery/timezone.py @@ -8,6 +8,6 @@ def tz_aware(value: datetime) -> datetime: """Return an UTC-aware datetime in case of USE_TZ=True.""" if settings.USE_TZ: - value = value.replace(tzinfo=timezone.utc) + return value.replace(tzinfo=timezone.utc) - return value + return value.replace(tzinfo=None) diff --git a/model_bakery/utils.py b/model_bakery/utils.py index f1cd4848..7da63263 100644 --- a/model_bakery/utils.py +++ b/model_bakery/utils.py @@ -86,7 +86,10 @@ def seq(value, increment_by=1, start=None, suffix=None): start = (date - epoch_datetime).total_seconds() increment_by = increment_by.total_seconds() for n in itertools.count(increment_by, increment_by): - series_date = tz_aware(datetime.datetime.utcfromtimestamp(start + n)) + series_date = tz_aware( + datetime.datetime.fromtimestamp(start + n, tz=datetime.timezone.utc) + ) + if type(value) is datetime.time: yield series_date.time() elif type(value) is datetime.date: