fixes to typing

Author: topper-123

pandas/compat/numpy/function.py

@@ -223,7 +223,7 @@ def validate_cum_func_with_skipna(skipna, args, kwargs, name) -> bool:
         skipna = True
 
     validate_cum_func(args, kwargs, fname=name)
-    return skipna  # pyright: ignore[reportGeneralTypeIssues]
+    return skipna
 
 
 ALLANY_DEFAULTS: dict[str, bool | None] = {}

pandas/core/frame.py

@@ -9930,12 +9930,7 @@ def _series_round(ser: Series, decimals: int) -> Series:
             new_cols = list(_dict_round(self, decimals))
         elif is_integer(decimals):
             # Dispatch to Series.round
-            new_cols = [
-                # error: Argument 2 to "_series_round" has incompatible type
-                # "Union[int, integer[Any]]"; expected "int"
-                _series_round(v, decimals)  # type: ignore[arg-type]
-                for _, v in self.items()
-            ]
+            new_cols = [_series_round(v, cast(int, decimals)) for _, v in self.items()]
         else:
             raise TypeError("decimals must be an integer, a dict-like or a Series")
 

pandas/core/generic.py

@@ -4075,8 +4075,8 @@ class   animal   locomotion
             loc, new_index = index._get_loc_level(key, level=0)
             if not drop_level:
                 if lib.is_integer(loc):
-                    # error: Slice index must be an integer or None
-                    new_index = index[loc : loc + 1]  # type: ignore[misc]
+                    loc = cast(int, loc)
+                    new_index = index[loc : loc + 1]
                 else:
                     new_index = index[loc]
         else:

pandas/core/indexes/api.py

@@ -69,7 +69,7 @@ def get_objs_combined_axis(
     objs,
     intersect: bool = False,
     axis: Axis = 0,
-    sort: bool | np.bool_ = True,
+    sort: bool = True,
     copy: bool = False,
 ) -> Index:
     """
@@ -116,7 +116,7 @@ def _get_distinct_objs(objs: list[Index]) -> list[Index]:
 def _get_combined_index(
     indexes: list[Index],
     intersect: bool = False,
-    sort: bool | np.bool_ = False,
+    sort: bool = False,
     copy: bool = False,
 ) -> Index:
     """

pandas/core/indexes/multi.py

@@ -2689,6 +2689,7 @@ def _partial_tup_index(self, tup: tuple, side: Literal["left", "right"] = "left"
         for k, (lab, lev, level_codes) in enumerate(zipped):
             section = level_codes[start:end]
 
+            loc: npt.NDArray[np.intp] | np.intp | int
             if lab not in lev and not isna(lab):
                 # short circuit
                 try:
@@ -2700,10 +2701,7 @@ def _partial_tup_index(self, tup: tuple, side: Literal["left", "right"] = "left"
                     # non-comparable level, e.g. test_groupby_example
                     raise TypeError(f"Level type mismatch: {lab}")
                 if side == "right" and loc >= 0:
-                    # error: Incompatible types in assignment (expression has type
-                    # "Union[int, Any]", variable has type "Union[ndarray[Any,
-                    # dtype[signedinteger[Any]]], signedinteger[Any]]")
-                    loc -= 1  # type: ignore[assignment]
+                    loc -= 1
                 return start + algos.searchsorted(section, loc, side=side)
 
             idx = self._get_loc_single_level_index(lev, lab)
@@ -2923,8 +2921,8 @@ def get_loc_level(self, key, level: IndexLabel = 0, drop_level: bool = True):
         loc, mi = self._get_loc_level(key, level=level)
         if not drop_level:
             if lib.is_integer(loc):
-                # error: Slice index must be an integer or None
-                mi = self[loc : loc + 1]  # type: ignore[misc]
+                loc = cast(int, loc)
+                mi = self[loc : loc + 1]
             else:
                 mi = self[loc]
         return loc, mi

pandas/core/indexes/period.py

@@ -294,12 +294,8 @@ def _maybe_convert_timedelta(self, other) -> int | npt.NDArray[np.int64]:
 
             raise raise_on_incompatible(self, other)
         elif is_integer(other):
-            # integer is passed to .shift via
-            # _add_datetimelike_methods basically
-            # but ufunc may pass integer to _add_delta
-            # error: Incompatible return value type (got "Union[int, integer[Any]]",
-            # expected "Union[int, ndarray[Any, dtype[signedinteger[_64Bit]]]]")
-            return other  # type: ignore[return-value]
+            assert isinstance(other, int)
+            return other
 
         # raise when input doesn't have freq
         raise raise_on_incompatible(self, None)

pandas/core/reshape/concat.py

@@ -556,7 +556,7 @@ def __init__(
             raise ValueError(
                 f"The 'sort' keyword only accepts boolean values; {sort} was passed."
             )
-        self.sort = sort
+        self.sort = cast(bool, sort)
 
         self.ignore_index = ignore_index
         self.verify_integrity = verify_integrity

pandas/io/parsers/python_parser.py

@@ -34,7 +34,6 @@
     ParserError,
 )
 
-from pandas.core.dtypes.common import is_integer
 from pandas.core.dtypes.inference import is_dict_like
 
 from pandas.io.common import (
@@ -1342,12 +1341,10 @@ def _validate_skipfooter_arg(skipfooter: int) -> int:
     ------
     ValueError : 'skipfooter' was not a non-negative integer.
     """
-    if not is_integer(skipfooter):
+    if not isinstance(skipfooter, int):
         raise ValueError("skipfooter must be an integer")
 
     if skipfooter < 0:
         raise ValueError("skipfooter cannot be negative")
 
-    # error: Incompatible return value type (got "Union[int, integer[Any]]",
-    # expected "int")
-    return skipfooter  # type: ignore[return-value]
+    return skipfooter

pandas/io/sql.py

@@ -50,7 +50,6 @@
 from pandas.core.dtypes.common import (
     is_datetime64tz_dtype,
     is_dict_like,
-    is_integer,
     is_list_like,
 )
 from pandas.core.dtypes.dtypes import DatetimeTZDtype
@@ -1066,8 +1065,7 @@ def insert(
                 chunk_iter = zip(*(arr[start_i:end_i] for arr in data_list))
                 num_inserted = exec_insert(conn, keys, chunk_iter)
                 # GH 46891
-                if is_integer(num_inserted):
-                    num_inserted = int(num_inserted)
+                if num_inserted is not None:
                     if total_inserted is None:
                         total_inserted = num_inserted
                     else:

pandas/util/_validators.py

@@ -258,7 +258,7 @@ def validate_bool_kwarg(
             f'For argument "{arg_name}" expected type bool, received '
             f"type {type(value).__name__}."
         )
-    return value  # pyright: ignore[reportGeneralTypeIssues]
+    return value
 
 
 def validate_fillna_kwargs(value, method, validate_scalar_dict_value: bool = True):
@@ -437,4 +437,4 @@ def validate_insert_loc(loc: int, length: int) -> int:
         loc += length
     if not 0 <= loc <= length:
         raise IndexError(f"loc must be an integer between -{length} and {length}")
-    return loc  # pyright: ignore[reportGeneralTypeIssues]
+    return loc

pyproject.toml

@@ -194,6 +194,7 @@ exclude = '''
 '''
 
 [tool.ruff]
+line-length = 88
 update-check = false
 target-version = "py38"