Merge pull request #19 from bryanforbes/improve-util

Improve typings for util

Author: zzzeek

setup.cfg

@@ -35,6 +35,8 @@ install_requires =
 
 [mypy]
 incremental = True
+strict = True
+warn_unused_ignores = False
 
 
 

sqlalchemy-stubs/util/_collections.pyi

@@ -41,7 +41,7 @@ if sys.version_info >= (3, 0):
 else:
     _B = TypeVar("_B", bound=Union[basestring, bytes])  # noqa: F821
 
-EMPTY_SET: frozenset
+EMPTY_SET: frozenset[None]
 
 class ImmutableContainer:
     def __delitem__(self, key: Any) -> NoReturn: ...
@@ -188,7 +188,10 @@ class OrderedSet(Set[_T]):
     def insert(self, pos: int, element: _T) -> None: ...
     def discard(self, element: _T) -> None: ...
     def clear(self) -> None: ...
-    def __getitem__(self, key: int): ...
+    @overload
+    def __getitem__(self, key: int) -> _T: ...
+    @overload
+    def __getitem__(self, s: slice) -> List[_T]: ...
     def __iter__(self) -> Iterator[_T]: ...
     def __add__(self: _OS, other: Iterable[_T]) -> _OS: ...
     def update(self: _OS, iterable: Iterable[_T]) -> _OS: ...  # type: ignore[override]

sqlalchemy-stubs/util/_concurrency_py3k.pyi

@@ -5,13 +5,20 @@ if sys.version_info >= (3, 0):
     from typing import Any
     from typing import Callable
     from typing import Coroutine
-    def await_only(awaitable: Coroutine) -> Any: ...
-    def await_fallback(awaitable: Coroutine) -> Any: ...
+    from typing import TypeVar
+
+    _T = TypeVar("_T")
+    _AAL = TypeVar("_AAL", bound=AsyncAdaptedLock)
+    def await_only(awaitable: Coroutine[_T, Any, Any]) -> _T: ...
+    def await_fallback(awaitable: Coroutine[_T, Any, Any]) -> _T: ...
     async def greenlet_spawn(
-        fn: Callable, *args: Any, _require_await: Any = ..., **kwargs: Any
-    ) -> Any: ...
+        fn: Callable[..., _T],
+        *args: Any,
+        _require_await: bool = ...,
+        **kwargs: Any,
+    ) -> _T: ...
     class AsyncAdaptedLock:
         mutex: Any = ...
         def __init__(self) -> None: ...
-        def __enter__(self): ...
+        def __enter__(self: _AAL) -> _AAL: ...
         def __exit__(self, *arg: Any, **kw: Any) -> None: ...

sqlalchemy-stubs/util/compat.pyi

@@ -162,7 +162,7 @@ else:
     collections_abc = collections
 
 def b(s: Any) -> Any: ...
-def decode_backslashreplace(text: binary_type, encoding: str): ...
+def decode_backslashreplace(text: binary_type, encoding: str) -> text_type: ...
 def raise_(
     exception: Any,
     with_traceback: Optional[Any] = ...,
@@ -187,12 +187,12 @@ def inspect_formatargspec(
 
 if sys.version_info >= (3, 7):
     from dataclasses import Field
-    def dataclass_fields(cls) -> Sequence[Field[Any]]: ...
-    def local_dataclass_fields(cls) -> List[Field[Any]]: ...
+    def dataclass_fields(cls: Any) -> Sequence[Field[Any]]: ...
+    def local_dataclass_fields(cls: Any) -> List[Field[Any]]: ...
 
 else:
-    def dataclass_fields(cls) -> Sequence[Any]: ...
-    def local_dataclass_fields(cls) -> List[Any]: ...
+    def dataclass_fields(cls: Any) -> Sequence[Any]: ...
+    def local_dataclass_fields(cls: Any) -> List[Any]: ...
 
 def raise_from_cause(
     exception: Any, exc_info: Optional[Any] = ...

sqlalchemy-stubs/util/langhelpers.pyi

@@ -178,7 +178,10 @@ class hybridproperty:
     func: Any = ...
     clslevel: Any = ...
     def __init__(self, func: Any) -> None: ...
-    def __get__(self, instance: Any, owner: Any): ...
+    @overload
+    def __get__(self: _HP, instance: None, owner: Any) -> _HP: ...
+    @overload
+    def __get__(self, instance: Any, owner: Any) -> Any: ...
     def classlevel(self: _HP, func: Any) -> _HP: ...
 
 class hybridmethod:
@@ -194,8 +197,8 @@ class _symbol(int):
         name: Any,
         doc: Optional[Any] = ...,
         canonical: Optional[Any] = ...,
-    ): ...
-    def __reduce__(self): ...
+    ) -> _symbol: ...
+    def __reduce__(self) -> Any: ...
 
 class symbol:
     symbols: Any = ...
@@ -218,7 +221,9 @@ def set_creation_order(instance: Any) -> None: ...
 def warn_exception(
     func: Callable[..., _T], *args: Any, **kwargs: Any
 ) -> _T: ...
-def ellipses_string(value: str, len_: int = ...): ...
+def ellipses_string(
+    value: compat.text_type, len_: int = ...
+) -> compat.text_type: ...
 def warn(msg: str) -> None: ...
 def warn_limited(msg: str, args: Any) -> None: ...
 def only_once(fn: _F, retry_on_exception: bool) -> _F: ...