A few more updates

Author: bryanforbes

sqlalchemy-stubs/sql/sqltypes.pyi

@@ -38,7 +38,7 @@ from ..util import compat as compat
 from ..util import langhelpers as langhelpers
 from ..util import pickle as pickle
 
-_U = TypeVar("_U")
+_T = TypeVar("_T")
 
 class _LookupExpressionAdapter:
     class Comparator(TypeEngine.Comparator): ...
@@ -187,7 +187,7 @@ class SchemaType(SchemaEventTarget):
         _create_events: bool = ...,
     ) -> None: ...
     def copy(self, **kw: Any): ...
-    def adapt(self, __impltype: Type[_U], **kw: Any) -> _U: ...
+    def adapt(self, __impltype: Type[_T], **kw: Any) -> _T: ...
     @property
     def bind(self): ...
     def create(
@@ -208,7 +208,7 @@ class Enum(Emulated, String, SchemaType):
     comparator_factory: Any = ...
     def as_generic(self, allow_nulltype: bool = ...): ...
     def adapt_to_emulated(self, impltype: Any, **kw: Any): ...
-    def adapt(self, __impltype: Type[_U], **kw: Any) -> _U: ...
+    def adapt(self, __impltype: Type[_T], **kw: Any) -> _T: ...
     def literal_processor(self, dialect: Any): ...
     def bind_processor(self, dialect: Any): ...
     def result_processor(self, dialect: Any, coltype: Any): ...

sqlalchemy-stubs/sql/type_api.pyi

@@ -1,4 +1,4 @@
-from _typeshed import SupportsLessThan
+import sys
 from typing import Any
 from typing import Callable
 from typing import Generic
@@ -27,14 +27,30 @@ INDEXABLE: Any
 TABLEVALUE: Any
 
 _T = TypeVar("_T")
+_T_co = TypeVar("_T_co", covariant=True)
+_T_contra = TypeVar("_T_contra", contravariant=True)
 _U = TypeVar("_U")
 
-_TE = TypeVar('_TE', bound=TypeEngine[Any])
-_NFE = TypeVar('_NFE', bound=NativeForEmulated)
-_TD = TypeVar('_TD', bound=TypeDecorator[Any])
-_VT = TypeVar('_VT', bound=Variant[Any])
+_TE = TypeVar("_TE", bound=TypeEngine[Any])
+_NFE = TypeVar("_NFE", bound=NativeForEmulated)
+_TD = TypeVar("_TD", bound=TypeDecorator[Any])
+_VT = TypeVar("_VT", bound=Variant[Any])
 
-_SortKeyFunction = Callable[[Any], SupportsLessThan]
+if sys.version_info[0] < 3:
+    from _typeshed import SupportsLessThan
+
+    _SortKeyFunction = Callable[[Any], SupportsLessThan]
+else:
+    _SortKeyFunction = Callable[[Any], Any]
+
+class _LiteralProcessor(Protocol[_T_contra]):
+    def __call__(self, __value: Optional[_T_contra]) -> str: ...
+
+class _BindProcessor(Protocol[_T_contra]):
+    def __call__(self, __value: Optional[_T_contra]) -> Optional[Any]: ...
+
+class _ResultProcessor(Protocol[_T_co]):
+    def __call__(self, __value: Optional[Any]) -> Optional[_T_co]: ...
 
 class TypeEngine(Traversible, Generic[_T]):
     class Comparator(operators.ColumnOperators):
@@ -56,9 +72,9 @@ class TypeEngine(Traversible, Generic[_T]):
         self, dialect: Any, conn_type: Any
     ) -> Any: ...
     def copy_value(self, value: _T) -> _T: ...
-    def literal_processor(self, dialect: Any) -> Optional[Callable[[Optional[_T]], str]]: ...
-    def bind_processor(self, dialect: Any) -> Optional[Callable[[Optional[_T]], Optional[Any]]]: ...
-    def result_processor(self, dialect: Any, coltype: Any) -> Optional[Callable[[Optional[Any]], Optional[_T]]]: ...
+    def literal_processor(self, dialect: Any) -> Optional[_LiteralProcessor[_T]]: ...
+    def bind_processor(self, dialect: Any) -> Optional[_BindProcessor[_T]]: ...
+    def result_processor(self, dialect: Any, coltype: Any) -> Optional[_ResultProcessor[_T]]: ...
     def column_expression(self, colexpr: Any) -> Any: ...
     def bind_expression(self, bindvalue: Any) -> Any: ...
     def compare_values(self, x: Any, y: Any) -> bool: ...
@@ -105,9 +121,9 @@ class TypeDecorator(SchemaEventTarget, TypeEngine[_T]):
     def process_literal_param(self, value: Optional[_T], dialect: Any) -> str: ...
     def process_bind_param(self, value: Optional[_T], dialect: Any) -> Any: ...
     def process_result_value(self, value: Any, dialect: Any) -> Optional[_T]: ...
-    def literal_processor(self, dialect: Any) -> Callable[[Optional[_T]], str]: ...
-    def bind_processor(self, dialect: Any) -> Callable[[Optional[_T]], Optional[Any]]: ...
-    def result_processor(self, dialect: Any, coltype: Any) -> Callable[[Optional[Any]], Optional[_T]]: ...
+    def literal_processor(self, dialect: Any) -> _LiteralProcessor[_T]: ...
+    def bind_processor(self, dialect: Any) -> _BindProcessor[_T]: ...
+    def result_processor(self, dialect: Any, coltype: Any) -> _ResultProcessor[_T]: ...
     def bind_expression(self, bindparam: Any) -> Any: ...
     def column_expression(self, column: Any) -> Any: ...
     def coerce_compared_value(self, op: Any, value: Any) -> Any: ...