From 9bee8af8d1082c3cde5f64c78f1e565ef4ab14cd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Brigitta=20Sip=C5=91cz?= Date: Thu, 5 Sep 2024 10:37:44 -0400 Subject: [PATCH] MAINT: avoiding assigning function --- examples/extending_query/temporal_range.py | 7 +++++-- lib/sqlalchemy/orm/events.py | 4 +++- test/orm/test_relationship_criteria.py | 7 +++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/examples/extending_query/temporal_range.py b/examples/extending_query/temporal_range.py index baeb041c5a..29ea119362 100644 --- a/examples/extending_query/temporal_range.py +++ b/examples/extending_query/temporal_range.py @@ -23,8 +23,11 @@ from sqlalchemy.orm import sessionmaker class HasTemporal: """Mixin that identifies a class as having a timestamp column""" - utc = partial(datetime.datetime.now, datetime.timezone.utc) - timestamp = Column(DateTime, default=utc, nullable=False) + timestamp = Column( + DateTime, + default=partial(datetime.datetime.now, datetime.timezone.utc), + nullable=False, + ) def temporal_range(range_lower, range_upper): diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py index 0278d737dd..b3f6047d59 100644 --- a/lib/sqlalchemy/orm/events.py +++ b/lib/sqlalchemy/orm/events.py @@ -3135,7 +3135,9 @@ class QueryEvents(event.Events[Query[Any]]): entity = desc['entity'] query = query.filter(entity.deleted == False) - update_context.values['timestamp'] = datetime.datetime.now(datetime.timezone.utc) + update_context.values['timestamp'] = ( + datetime.datetime.now(datetime.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 75ff13dc0a..29720f7dc8 100644 --- a/test/orm/test_relationship_criteria.py +++ b/test/orm/test_relationship_criteria.py @@ -1661,8 +1661,11 @@ class TemporalFixtureTest(testing.fixtures.DeclarativeMappedTest): class HasTemporal: """Mixin that identifies a class as having a timestamp column""" - utc = partial(datetime.datetime.now, datetime.timezone.utc) - timestamp = Column(DateTime, default=utc, nullable=False) + timestamp = Column( + DateTime, + default=partial(datetime.datetime.now, datetime.timezone.utc), + nullable=False, + ) cls.HasTemporal = HasTemporal -- 2.47.2