wip

Author: MarcoGorelli

narwhals/pandas_like/expr.py

@@ -9,14 +9,14 @@
 from narwhals.spec import ExprStringNamespace as ExprStringNamespaceT
 from narwhals.spec import LazyFrame as LazyFrameProtocol
 from narwhals.spec import Namespace as NamespaceProtocol
-from narwhals.spec import Series as SeriesT
+from narwhals.spec import Series as SeriesProtocol
 from narwhals.utils import register_expression_call
 
 
 class Expr(ExprT):
     def __init__(  # noqa: PLR0913
         self,
-        call: Callable[[DataFrameT | LazyFrameProtocol], list[SeriesT]],
+        call: Callable[[DataFrameT | LazyFrameProtocol], list[SeriesProtocol]],
         *,
         depth: int | None,
         function_name: str | None,

narwhals/pandas_like/namespace.py

@@ -15,7 +15,7 @@
 from narwhals.spec import IntoExpr
 from narwhals.spec import LazyFrame as LazyFrameProtocol
 from narwhals.spec import Namespace as NamespaceProtocol
-from narwhals.spec import Series as SeriesT
+from narwhals.spec import Series as SeriesProtocol
 from narwhals.utils import flatten_str
 from narwhals.utils import horizontal_concat
 from narwhals.utils import parse_into_exprs
@@ -110,7 +110,7 @@ def len(self) -> ExprT:
 
     def _create_expr_from_callable(  # noqa: PLR0913
         self,
-        func: Callable[[DataFrameT | LazyFrameProtocol], list[SeriesT]],
+        func: Callable[[DataFrameT | LazyFrameProtocol], list[SeriesProtocol]],
         *,
         depth: int,
         function_name: str | None,
@@ -126,7 +126,9 @@ def _create_expr_from_callable(  # noqa: PLR0913
             implementation=self._implementation,
         )
 
-    def _create_series_from_scalar(self, value: Any, series: SeriesT) -> SeriesT:
+    def _create_series_from_scalar(
+        self, value: Any, series: SeriesProtocol
+    ) -> SeriesProtocol:
         return Series(
             series_from_iterable(
                 [value],
@@ -138,7 +140,7 @@ def _create_series_from_scalar(self, value: Any, series: SeriesT) -> SeriesT:
             implementation=self._implementation,
         )
 
-    def _create_expr_from_series(self, series: SeriesT) -> ExprT:
+    def _create_expr_from_series(self, series: SeriesProtocol) -> ExprT:
         return Expr(
             lambda _df: [series],
             depth=0,

narwhals/pandas_like/series.py

@@ -5,15 +5,15 @@
 
 from pandas.api.types import is_extension_array_dtype
 
-from narwhals.spec import Series as SeriesT
+from narwhals.spec import Series as SeriesProtocol
 from narwhals.utils import item
 from narwhals.utils import validate_column_comparand
 
 if TYPE_CHECKING:
     from narwhals.pandas_like.namespace import Namespace
 
 
-class Series(SeriesT):
+class Series(SeriesProtocol):
     def __init__(
         self,
         series: Any,
@@ -266,7 +266,7 @@ def n_unique(self) -> int:
         ser = self.series
         return ser.nunique()
 
-    def zip_with(self, mask: SeriesT, other: SeriesT) -> SeriesT:
+    def zip_with(self, mask: SeriesProtocol, other: SeriesProtocol) -> SeriesProtocol:
         ser = self.series
         return self._from_series(ser.where(mask, other))
 
@@ -276,7 +276,7 @@ def sample(self, n: int, fraction: float, *, with_replacement: bool) -> Series:
             ser.sample(n=n, frac=fraction, with_replacement=with_replacement)
         )
 
-    def unique(self) -> SeriesT:
+    def unique(self) -> SeriesProtocol:
         ser = self.series
         return ser.unique()