Improve engine.row (#99)

Author: bryanforbes

sqlalchemy-stubs/engine/row.pyi

@@ -1,16 +1,25 @@
-# fmt: off
-import abc
 from typing import Any
+from typing import Collection
+from typing import Generic
+from typing import ItemsView
+from typing import Iterator
+from typing import KeysView
+from typing import List
+from typing import Mapping
+from typing import Sequence
+from typing import Tuple
+from typing import Type
+from typing import TypeVar
+from typing import ValuesView
 
-from sqlalchemy.cresultproxy import BaseRow as BaseRow
-from sqlalchemy.cresultproxy import safe_rowproxy_reconstructor as safe_rowproxy_reconstructor
-from .. import util as util
-from ..util.compat import collections_abc as collections_abc
-# fmt: on
+from .result import ResultMetaData
+from .result import RMKeyView
+
+_T = TypeVar("_T")
 
 MD_INDEX: int
 
-def rowproxy_reconstructor(cls, state: Any): ...
+def rowproxy_reconstructor(cls: Type[_T], state: Any) -> _T: ...
 
 KEY_INTEGER_ONLY: int
 KEY_OBJECTS_ONLY: int
@@ -20,59 +29,62 @@ KEY_OBJECTS_NO_WARN: int
 class BaseRow:
     def __init__(
         self,
-        parent: Any,
+        parent: ResultMetaData,
         processors: Any,
         keymap: Any,
         key_style: Any,
         data: Any,
     ) -> None: ...
-    def __reduce__(self): ...
-    def __iter__(self) -> Any: ...
-    def __len__(self): ...
-    def __hash__(self) -> Any: ...
-    def __getitem__(self, key: Any): ...
-    def __getattr__(self, name: Any): ...
+    def __reduce__(self) -> Any: ...
+    def __iter__(self) -> Iterator[Any]: ...
+    def __len__(self) -> int: ...
+    def __hash__(self) -> int: ...
+    def __getitem__(self, key: Any) -> Any: ...
+    def __getattr__(self, name: Any) -> Any: ...
 
-class Row(BaseRow, collections_abc.Sequence, metaclass=abc.ABCMeta):
-    def __contains__(self, key: Any): ...
-    __hash__: Any = ...
-    def __lt__(self, other: Any) -> Any: ...
-    def __le__(self, other: Any) -> Any: ...
-    def __ge__(self, other: Any) -> Any: ...
-    def __gt__(self, other: Any) -> Any: ...
-    def __eq__(self, other: Any) -> Any: ...
-    def __ne__(self, other: Any) -> Any: ...
-    def keys(self): ...
+class Row(BaseRow, Sequence[Any]):
+    @property
+    def _mapping(self) -> RowMapping: ...
+    def __contains__(self, key: Any) -> bool: ...
+    def __hash__(self) -> int: ...
+    def __lt__(self, other: Any) -> bool: ...
+    def __le__(self, other: Any) -> bool: ...
+    def __ge__(self, other: Any) -> bool: ...
+    def __gt__(self, other: Any) -> bool: ...
+    def __eq__(self, other: Any) -> bool: ...
+    def __ne__(self, other: Any) -> bool: ...
+    def keys(self) -> List[str]: ...
 
-class LegacyRow(Row, metaclass=abc.ABCMeta):
-    def __contains__(self, key: Any): ...
-    __getitem__: Any = ...
-    def has_key(self, key: Any): ...
-    def items(self): ...
-    def iterkeys(self): ...
-    def itervalues(self): ...
-    def values(self): ...
+class LegacyRow(Row):
+    def __contains__(self, key: Any) -> bool: ...
+    def __getitem__(self, key: Any) -> Any: ...
+    def has_key(self, key: str) -> bool: ...
+    def items(self) -> List[Tuple[str, Any]]: ...
+    def iterkeys(self) -> Iterator[str]: ...
+    def itervalues(self) -> Iterator[Any]: ...
+    def values(self) -> List[Any]: ...
 
 BaseRowProxy = BaseRow
 RowProxy = Row
 
-class ROMappingView(
-    collections_abc.KeysView,
-    collections_abc.ValuesView,
-    collections_abc.ItemsView,
+class ROMappingView(  # type: ignore[misc]
+    KeysView[str],
+    ValuesView[Any],
+    ItemsView[str, Any],
+    Generic[_T],
 ):
-    def __init__(self, mapping: Any, items: Any) -> None: ...
-    def __len__(self): ...
-    def __iter__(self) -> Any: ...
-    def __contains__(self, item: Any): ...
-    def __eq__(self, other: Any) -> Any: ...
-    def __ne__(self, other: Any) -> Any: ...
+    def __init__(self, mapping: RowMapping, items: Collection[_T]) -> None: ...
+    def __len__(self) -> int: ...
+    def __iter__(self) -> Iterator[Tuple[str, _T]]: ...  # type: ignore[override]
+    def __contains__(self, item: Any) -> bool: ...
+    def __eq__(self, other: Any) -> bool: ...
+    def __ne__(self, other: Any) -> bool: ...
 
-class RowMapping(BaseRow, collections_abc.Mapping):
-    __getitem__: Any = ...
-    def __iter__(self) -> Any: ...
-    def __len__(self): ...
-    def __contains__(self, key: Any): ...
-    def items(self): ...
-    def keys(self): ...
-    def values(self): ...
+class RowMapping(BaseRow, Mapping[str, Any]):
+    def __getitem__(self, key: str) -> Any: ...
+    def __iter__(self) -> Iterator[str]: ...
+    def __len__(self) -> int: ...
+    def __contains__(self, key: Any) -> bool: ...
+    def items(self) -> ROMappingView[Tuple[str, Any]]: ...  # type: ignore[override]
+    def keys(self) -> RMKeyView: ...
+    def values(self) -> ROMappingView[Any]: ...