Improve miscellaneous engine modules (#89)

Author: bryanforbes

sqlalchemy-stubs/engine/characteristics.pyi

@@ -1,23 +1,33 @@
 import abc
 from typing import Any
 
-from ..util import ABC as ABC
+from .interfaces import _DBAPIConnection
+from .interfaces import Dialect
+from ..util import ABC
 
 class ConnectionCharacteristic(ABC, metaclass=abc.ABCMeta):
     transactional: bool = ...
     @abc.abstractmethod
-    def reset_characteristic(self, dialect: Any, dbapi_conn: Any) -> Any: ...
+    def reset_characteristic(
+        self, dialect: Dialect, dbapi_conn: _DBAPIConnection
+    ) -> None: ...
     @abc.abstractmethod
     def set_characteristic(
-        self, dialect: Any, dbapi_conn: Any, value: Any
-    ) -> Any: ...
+        self, dialect: Dialect, dbapi_conn: _DBAPIConnection, value: Any
+    ) -> None: ...
     @abc.abstractmethod
-    def get_characteristic(self, dialect: Any, dbapi_conn: Any) -> Any: ...
+    def get_characteristic(
+        self, dialect: Dialect, dbapi_conn: _DBAPIConnection
+    ) -> Any: ...
 
 class IsolationLevelCharacteristic(ConnectionCharacteristic):
     transactional: bool = ...
-    def reset_characteristic(self, dialect: Any, dbapi_conn: Any) -> None: ...
+    def reset_characteristic(
+        self, dialect: Dialect, dbapi_conn: _DBAPIConnection
+    ) -> None: ...
     def set_characteristic(
-        self, dialect: Any, dbapi_conn: Any, value: Any
+        self, dialect: Dialect, dbapi_conn: _DBAPIConnection, value: Any
     ) -> None: ...
-    def get_characteristic(self, dialect: Any, dbapi_conn: Any): ...
+    def get_characteristic(
+        self, dialect: Dialect, dbapi_conn: _DBAPIConnection
+    ) -> Any: ...

sqlalchemy-stubs/engine/events.pyi

@@ -1,10 +1,7 @@
 from typing import Any
 
-from .base import Engine as Engine
-from .interfaces import Connectable as Connectable
-from .interfaces import Dialect as Dialect
-from .. import event as event
-from .. import exc as exc
+from .interfaces import Dialect
+from .. import event
 
 class ConnectionEvents(event.Events):
     def before_execute(
@@ -70,7 +67,7 @@ class ConnectionEvents(event.Events):
 
 class DialectEvents(event.Events):
     def do_connect(
-        self, dialect: Any, conn_rec: Any, cargs: Any, cparams: Any
+        self, dialect: Dialect, conn_rec: Any, cargs: Any, cparams: Any
     ) -> None: ...
     def do_executemany(
         self, cursor: Any, statement: Any, parameters: Any, context: Any

sqlalchemy-stubs/engine/strategies.pyi

@@ -1,6 +1,6 @@
-from typing import Any
+from typing import Type
 
-from .mock import MockConnection as MockConnection
+from .mock import MockConnection as _MockConnection
 
 class MockEngineStrategy:
-    MockConnection: Any = ...
+    MockConnection: Type[_MockConnection] = ...

sqlalchemy-stubs/engine/util.pyi

@@ -1,9 +1,3 @@
 from typing import Any
 
-from .. import exc as exc
-from .. import util as util
-from ..util import collections_abc as collections_abc
-from ..util import immutabledict as immutabledict
-
-def connection_memoize(key: Any): ...
-def py_fallback(): ...
+def connection_memoize(key: Any) -> Any: ...