Merge branch 'main' into pandas-vs-scipy-interpolation-naming-clarification

Author: milosz-martynow

pandas/_testing/asserters.py

@@ -571,20 +571,12 @@ def raise_assert_detail(
 
     if isinstance(left, np.ndarray):
         left = pprint_thing(left)
-    elif (
-        isinstance(left, CategoricalDtype)
-        or isinstance(left, PandasDtype)
-        or isinstance(left, StringDtype)
-    ):
+    elif isinstance(left, (CategoricalDtype, PandasDtype, StringDtype)):
         left = repr(left)
 
     if isinstance(right, np.ndarray):
         right = pprint_thing(right)
-    elif (
-        isinstance(right, CategoricalDtype)
-        or isinstance(right, PandasDtype)
-        or isinstance(right, StringDtype)
-    ):
+    elif isinstance(right, (CategoricalDtype, PandasDtype, StringDtype)):
         right = repr(right)
 
     msg += f"""

pandas/core/arrays/datetimelike.py

@@ -112,13 +112,13 @@
 )
 
 from pandas.core import (
+    algorithms,
     nanops,
     ops,
 )
 from pandas.core.algorithms import (
     checked_add_with_arr,
     isin,
-    mode,
     unique1d,
 )
 from pandas.core.arraylike import OpsMixin
@@ -1690,7 +1690,7 @@ def _mode(self, dropna: bool = True):
         if dropna:
             mask = self.isna()
 
-        i8modes = mode(self.view("i8"), mask=mask)
+        i8modes = algorithms.mode(self.view("i8"), mask=mask)
         npmodes = i8modes.view(self._ndarray.dtype)
         npmodes = cast(np.ndarray, npmodes)
         return self._from_backing_data(npmodes)

pandas/core/base.py

@@ -61,11 +61,6 @@
     ops,
 )
 from pandas.core.accessor import DirNamesMixin
-from pandas.core.algorithms import (
-    duplicated,
-    unique1d,
-    value_counts,
-)
 from pandas.core.arraylike import OpsMixin
 from pandas.core.arrays import ExtensionArray
 from pandas.core.construction import (
@@ -991,7 +986,7 @@ def value_counts(
         NaN    1
         dtype: int64
         """
-        return value_counts(
+        return algorithms.value_counts(
             self,
             sort=sort,
             ascending=ascending,
@@ -1006,7 +1001,7 @@ def unique(self):
             # i.e. ExtensionArray
             result = values.unique()
         else:
-            result = unique1d(values)
+            result = algorithms.unique1d(values)
         return result
 
     @final
@@ -1294,7 +1289,7 @@ def drop_duplicates(self, *, keep: DropKeep = "first"):
 
     @final
     def _duplicated(self, keep: DropKeep = "first") -> npt.NDArray[np.bool_]:
-        return duplicated(self._values, keep=keep)
+        return algorithms.duplicated(self._values, keep=keep)
 
     def _arith_method(self, other, op):
         res_name = ops.get_op_result_name(self, other)

pandas/core/computation/pytables.py

@@ -650,7 +650,7 @@ def maybe_expression(s) -> bool:
     """loose checking if s is a pytables-acceptable expression"""
     if not isinstance(s, str):
         return False
-    ops = PyTablesExprVisitor.binary_ops + PyTablesExprVisitor.unary_ops + ("=",)
+    operations = PyTablesExprVisitor.binary_ops + PyTablesExprVisitor.unary_ops + ("=",)
 
     # make sure we have an op at least
-    return any(op in s for op in ops)
+    return any(op in s for op in operations)

pandas/core/indexes/base.py

@@ -1648,7 +1648,7 @@ def _get_default_index_names(
         from pandas.core.indexes.multi import MultiIndex
 
         if names is not None:
-            if isinstance(names, str) or isinstance(names, int):
+            if isinstance(names, (int, str)):
                 names = [names]
 
         if not isinstance(names, list) and names is not None:

pandas/core/indexes/datetimes.py

@@ -1,12 +1,6 @@
 from __future__ import annotations
 
-from datetime import (
-    date,
-    datetime,
-    time,
-    timedelta,
-    tzinfo,
-)
+import datetime as dt
 import operator
 from typing import (
     TYPE_CHECKING,
@@ -257,7 +251,7 @@ def _engine_type(self) -> type[libindex.DatetimeEngine]:
 
     _data: DatetimeArray
     inferred_freq: str | None
-    tz: tzinfo | None
+    tz: dt.tzinfo | None
 
     # --------------------------------------------------------------------
     # methods that dispatch to DatetimeArray and wrap result
@@ -514,7 +508,7 @@ def snap(self, freq: Frequency = "S") -> DatetimeIndex:
     # --------------------------------------------------------------------
     # Indexing Methods
 
-    def _parsed_string_to_bounds(self, reso: Resolution, parsed: datetime):
+    def _parsed_string_to_bounds(self, reso: Resolution, parsed: dt.datetime):
         """
         Calculate datetime bounds for parsed time string and its resolution.
 
@@ -604,13 +598,13 @@ def get_loc(self, key, method=None, tolerance=None):
 
             key = self._maybe_cast_for_get_loc(key)
 
-        elif isinstance(key, timedelta):
+        elif isinstance(key, dt.timedelta):
             # GH#20464
             raise TypeError(
                 f"Cannot index {type(self).__name__} with {type(key).__name__}"
             )
 
-        elif isinstance(key, time):
+        elif isinstance(key, dt.time):
             if method is not None:
                 raise NotImplementedError(
                     "cannot yet lookup inexact labels when key is a time object"
@@ -648,7 +642,7 @@ def _maybe_cast_for_get_loc(self, key) -> Timestamp:
     def _maybe_cast_slice_bound(self, label, side: str):
 
         # GH#42855 handle date here instead of get_slice_bound
-        if isinstance(label, date) and not isinstance(label, datetime):
+        if isinstance(label, dt.date) and not isinstance(label, dt.datetime):
             # Pandas supports slicing with dates, treated as datetimes at midnight.
             # https://github.com/pandas-dev/pandas/issues/31501
             label = Timestamp(label).to_pydatetime()
@@ -674,12 +668,12 @@ def slice_indexer(self, start=None, end=None, step=None):
         # For historical reasons DatetimeIndex supports slices between two
         # instances of datetime.time as if it were applying a slice mask to
         # an array of (self.hour, self.minute, self.seconds, self.microsecond).
-        if isinstance(start, time) and isinstance(end, time):
+        if isinstance(start, dt.time) and isinstance(end, dt.time):
             if step is not None and step != 1:
                 raise ValueError("Must have step size of 1 with time slices")
             return self.indexer_between_time(start, end)
 
-        if isinstance(start, time) or isinstance(end, time):
+        if isinstance(start, dt.time) or isinstance(end, dt.time):
             raise KeyError("Cannot mix time and non-time slice keys")
 
         def check_str_or_none(point) -> bool:
@@ -1092,6 +1086,6 @@ def bdate_range(
     )
 
 
-def _time_to_micros(time_obj: time) -> int:
+def _time_to_micros(time_obj: dt.time) -> int:
     seconds = time_obj.hour * 60 * 60 + 60 * time_obj.minute + time_obj.second
     return 1_000_000 * seconds + time_obj.microsecond

pandas/io/formats/xml.py

@@ -419,14 +419,12 @@ def add_declaration(self) -> bytes:
         """
         decl = f'<?xml version="1.0" encoding="{self.encoding}"?>\n'
 
-        doc = (
+        return (
             self.out_xml
             if self.out_xml.startswith(b"<?xml")
             else decl.encode(self.encoding) + self.out_xml
         )
 
-        return doc
-
     def remove_declaration(self) -> bytes:
         """
         Remove xml declaration.

pandas/io/json/_table_schema.py

@@ -12,7 +12,7 @@
 )
 import warnings
 
-from pandas._libs import json
+from pandas._libs.json import loads
 from pandas._typing import (
     DtypeObj,
     JSONSerializable,
@@ -41,7 +41,6 @@
     from pandas import Series
     from pandas.core.indexes.multi import MultiIndex
 
-loads = json.loads
 
 TABLE_SCHEMA_VERSION = "1.4.0"
 

pyproject.toml

@@ -101,7 +101,6 @@ disable = [
 
   # pylint type "R": refactor, for bad code smell
   "comparison-with-itself",
-  "consider-merging-isinstance",
   "consider-using-ternary",
   "consider-using-with",
   "cyclic-import",