From 6bd8921d888ad71bed5b703c9ef05170afad5d16 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 28 Dec 2023 11:10:26 -0500 Subject: [PATCH] changelog edits Change-Id: I115807ccca74e55e96389d7bb723da3893bcc965 (cherry picked from commit 1a2748152b0f2feb527c6a04054f88d4a659a818) --- doc/build/changelog/unreleased_20/10717.rst | 2 +- doc/build/changelog/unreleased_20/10732.rst | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/build/changelog/unreleased_20/10717.rst b/doc/build/changelog/unreleased_20/10717.rst index 2cd9303455..ccdcd80bb9 100644 --- a/doc/build/changelog/unreleased_20/10717.rst +++ b/doc/build/changelog/unreleased_20/10717.rst @@ -4,7 +4,7 @@ Adjusted the asyncpg dialect such that when the ``terminate()`` method is used to discard an invalidated connection, the dialect will first attempt - to gracefully close the conneciton using ``.close()`` with a timeout, if + to gracefully close the connection using ``.close()`` with a timeout, if the operation is proceeding within an async event loop context only. This allows the asyncpg driver to attend to finalizing a ``TimeoutError`` including being able to close a long-running query server side, which diff --git a/doc/build/changelog/unreleased_20/10732.rst b/doc/build/changelog/unreleased_20/10732.rst index 0961b05d73..fb1c22a980 100644 --- a/doc/build/changelog/unreleased_20/10732.rst +++ b/doc/build/changelog/unreleased_20/10732.rst @@ -1,9 +1,9 @@ .. change:: :tags: bug, orm - :tickets: 10668 + :tickets: 10732 Modified the ``__init_subclass__()`` method used by - :class:`_orm.MappedAsDataclass`, :class:`_orm.DeclarativeBase`` and + :class:`_orm.MappedAsDataclass`, :class:`_orm.DeclarativeBase` and :class:`_orm.DeclarativeBaseNoMeta` to accept arbitrary ``**kw`` and to propagate them to the ``super()`` call, allowing greater flexibility in arranging custom superclasses and mixins which make use of -- 2.47.2