From: Brigitta Sipőcz Date: Wed, 4 Sep 2024 21:49:08 +0000 (-0400) Subject: BUG: fix compatibility for older python versions X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a7b7287ffb7eae6bf4a822a595c41cb13e105b5;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git BUG: fix compatibility for older python versions --- diff --git a/examples/extending_query/temporal_range.py b/examples/extending_query/temporal_range.py index 92f182780f..baeb041c5a 100644 --- a/examples/extending_query/temporal_range.py +++ b/examples/extending_query/temporal_range.py @@ -23,7 +23,7 @@ from sqlalchemy.orm import sessionmaker class HasTemporal: """Mixin that identifies a class as having a timestamp column""" - utc = partial(datetime.datetime.now, datetime.UTC) + utc = partial(datetime.datetime.now, datetime.timezone.utc) timestamp = Column(DateTime, default=utc, nullable=False) diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py index 5151944749..0278d737dd 100644 --- a/lib/sqlalchemy/orm/events.py +++ b/lib/sqlalchemy/orm/events.py @@ -3135,7 +3135,7 @@ class QueryEvents(event.Events[Query[Any]]): entity = desc['entity'] query = query.filter(entity.deleted == False) - update_context.values['timestamp'] = datetime.datetime.now(datetime.UTC) + update_context.values['timestamp'] = datetime.datetime.now(datetime.timezone.utc) return query The ``.values`` dictionary of the "update context" object can also diff --git a/test/orm/test_relationship_criteria.py b/test/orm/test_relationship_criteria.py index d4c532a0b7..75ff13dc0a 100644 --- a/test/orm/test_relationship_criteria.py +++ b/test/orm/test_relationship_criteria.py @@ -1661,7 +1661,7 @@ class TemporalFixtureTest(testing.fixtures.DeclarativeMappedTest): class HasTemporal: """Mixin that identifies a class as having a timestamp column""" - utc = partial(datetime.datetime.now, datetime.UTC) + utc = partial(datetime.datetime.now, datetime.timezone.utc) timestamp = Column(DateTime, default=utc, nullable=False) cls.HasTemporal = HasTemporal