Apply ruff/flake8-simplify rule SIM102

SIM102 Use a single `if` statement instead of nested `if` statements
pydata · max-sixty · Jun 30, 2025 · Jun 28, 2025 · Jun 28, 2025 · Jun 28, 2025
commit 18e4381b70c9dee6a722c2355bb72af9dc2b007a
diff --git a/xarray/coding/times.py b/xarray/coding/times.py
@@ -733,7 +733,7 @@ def infer_calendar_name(dates) -> CFCalendar:
     """Given an array of datetimes, infer the CF calendar name"""
     if is_np_datetime_like(dates.dtype):
         return "proleptic_gregorian"
-    elif dates.dtype == np.dtype("O") and dates.size > 0:
+    elif dates.dtype == np.dtype("O") and dates.size > 0:  # noqa: SIM102
         # Logic copied from core.common.contains_cftime_datetimes.
         if cftime is not None:
             sample = np.asarray(dates).flat[0]

diff --git a/xarray/core/formatting.py b/xarray/core/formatting.py
@@ -989,9 +989,10 @@ def diff_array_repr(a, b, compat):
         ):
             summary.append(coords_diff)
 
-    if compat == "identical":
-        if attrs_diff := diff_attrs_repr(a.attrs, b.attrs, compat):
-            summary.append(attrs_diff)
+    if compat == "identical" and (
+        attrs_diff := diff_attrs_repr(a.attrs, b.attrs, compat)
+    ):
+        summary.append(attrs_diff)
 
     return "\n".join(summary)
 
@@ -1029,9 +1030,10 @@ def diff_dataset_repr(a, b, compat):
     ):
         summary.append(data_diff)
 
-    if compat == "identical":
-        if attrs_diff := diff_attrs_repr(a.attrs, b.attrs, compat):
-            summary.append(attrs_diff)
+    if compat == "identical" and (
+        attrs_diff := diff_attrs_repr(a.attrs, b.attrs, compat)
+    ):
+        summary.append(attrs_diff)
 
     return "\n".join(summary)
 

diff --git a/xarray/plot/utils.py b/xarray/plot/utils.py
@@ -419,9 +419,10 @@ def _infer_xy_labels(
         _assert_valid_xy(darray, x, "x")
         _assert_valid_xy(darray, y, "y")
 
-        if darray._indexes.get(x, 1) is darray._indexes.get(y, 2):
-            if isinstance(darray._indexes[x], PandasMultiIndex):
-                raise ValueError("x and y cannot be levels of the same MultiIndex")
+        if darray._indexes.get(x, 1) is darray._indexes.get(y, 2) and isinstance(
+            darray._indexes[x], PandasMultiIndex
+        ):
+            raise ValueError("x and y cannot be levels of the same MultiIndex")
 
     return x, y