From f9b8739a4ec58ce35950c9695cd0da1892727e07 Mon Sep 17 00:00:00 2001 From: Christodoulos Tsoulloftas Date: Mon, 18 Dec 2023 16:34:54 +0200 Subject: [PATCH] Replace depreated datetime.datetime.utcnow() --- tests/models/test_datatype.py | 16 ++++++++++------ xsdata/models/datatype.py | 8 ++++---- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/tests/models/test_datatype.py b/tests/models/test_datatype.py index fa260b999..60d76163c 100644 --- a/tests/models/test_datatype.py +++ b/tests/models/test_datatype.py @@ -223,13 +223,17 @@ def test_datetime_helpers(self): now = datetime.now(tz=timezone.utc).replace(microsecond=0, second=0, minute=1) self.assertEqual( XmlDateTime.from_datetime(now), - XmlDateTime.utcnow().replace(fractional_second=0, second=0, minute=1), + XmlDateTime.now(timezone.utc).replace( + fractional_second=0, second=0, minute=1 + ), ) - now = datetime.utcnow().replace(microsecond=0, second=0, minute=1) + now = datetime.now(timezone.utc).replace(microsecond=0, second=0, minute=1) self.assertEqual( XmlDateTime.from_datetime(now), - XmlDateTime.utcnow().replace(fractional_second=0, second=0, minute=1), + XmlDateTime.now(timezone.utc).replace( + fractional_second=0, second=0, minute=1 + ), ) def test_comparisons(self): @@ -369,13 +373,13 @@ def test_datetime_helpers(self): now = datetime.now(tz=timezone.utc).replace(microsecond=0, second=0, minute=1) self.assertEqual( XmlTime.from_time(now.time()), - XmlTime.utcnow().replace(fractional_second=0, second=0, minute=1), + XmlTime.now(timezone.utc).replace(fractional_second=0, second=0, minute=1), ) - now = datetime.utcnow().replace(microsecond=0, second=0, minute=1) + now = datetime.now(timezone.utc).replace(microsecond=0, second=0, minute=1) self.assertEqual( XmlTime.from_time(now.time()), - XmlTime.utcnow().replace(fractional_second=0, second=0, minute=1), + XmlTime.now(timezone.utc).replace(fractional_second=0, second=0, minute=1), ) def test_comparisons(self): diff --git a/xsdata/models/datatype.py b/xsdata/models/datatype.py index a2d8a0ebc..282f67e49 100644 --- a/xsdata/models/datatype.py +++ b/xsdata/models/datatype.py @@ -228,8 +228,8 @@ def now(cls, tz: Optional[datetime.timezone] = None) -> "XmlDateTime": @classmethod def utcnow(cls) -> "XmlDateTime": - """Initialize from datetime.datetime.utcnow()""" - return cls.from_datetime(datetime.datetime.utcnow()) + """Initialize from datetime.now(timezone.utc)""" + return cls.from_datetime(datetime.datetime.now(datetime.timezone.utc)) def to_datetime(self) -> datetime.datetime: """Return a :class:`datetime.datetime` instance.""" @@ -411,8 +411,8 @@ def now(cls, tz: Optional[datetime.timezone] = None) -> "XmlTime": @classmethod def utcnow(cls) -> "XmlTime": - """Initialize from datetime.datetime.utcnow()""" - return cls.from_time(datetime.datetime.utcnow().time()) + """Initialize from datetime.now(timezone.utc)""" + return cls.from_time(datetime.datetime.now(datetime.timezone.utc).time()) def to_time(self) -> datetime.time: """Return a :class:`datetime.time` instance."""