From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 12 Aug 2022 22:35:14 +0000 (-0400)
Subject: restore Connectable and other changes for oslo.db
X-Git-Tag: rel_2_0_0b1~111^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cad8827c27c87d70db522ec88a89ca3c2a4ef76;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

restore Connectable and other changes for oslo.db

at this point oslo.db should be passing tests however
they seem to be importing "Connectable", which we had
temporarily removed, it's now a different kind of object
but restore it to the engine import space which seems
to be where they're pulling it from to see if oslo.db
can run some tests now.

Change-Id: I52cb5ad82b00eec12004eeeb571c4eb8efa5ced2
---

diff --git a/lib/sqlalchemy/engine/__init__.py b/lib/sqlalchemy/engine/__init__.py
index 7bbeb1e73b..dc871785d2 100644
--- a/lib/sqlalchemy/engine/__init__.py
+++ b/lib/sqlalchemy/engine/__init__.py
@@ -30,7 +30,9 @@ from .cursor import ResultProxy as ResultProxy
 from .interfaces import AdaptedConnection as AdaptedConnection
 from .interfaces import BindTyping as BindTyping
 from .interfaces import Compiled as Compiled
+from .interfaces import Connectable as Connectable
 from .interfaces import ConnectArgsType as ConnectArgsType
+from .interfaces import ConnectionEventsTarget as ConnectionEventsTarget
 from .interfaces import CreateEnginePlugin as CreateEnginePlugin
 from .interfaces import Dialect as Dialect
 from .interfaces import ExceptionContext as ExceptionContext