Skip to content

Commit b6dbad7

Browse files
committed
STY: add strict=... to zip() in pandas/tests/indexes (B905)
1 parent d8b3ff3 commit b6dbad7

22 files changed

+46
-46
lines changed

pandas/tests/indexes/categorical/test_map.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def test_map_with_dict_or_series():
138138
# Order of categories in result can be different
139139
tm.assert_index_equal(result, expected)
140140

141-
mapper = dict(zip(orig_values[:-1], new_values[:-1]))
141+
mapper = dict(zip(orig_values[:-1], new_values[:-1], strict=True))
142142
result = cur_index.map(mapper)
143143
# Order of categories in result can be different
144144
tm.assert_index_equal(result, expected)

pandas/tests/indexes/datetimes/methods/test_astype.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ def test_index_convert_to_datetime_array(self):
239239
def _check_rng(rng):
240240
converted = rng.to_pydatetime()
241241
assert isinstance(converted, np.ndarray)
242-
for x, stamp in zip(converted, rng):
242+
for x, stamp in zip(converted, rng, strict=True):
243243
assert isinstance(x, datetime)
244244
assert x == stamp.to_pydatetime()
245245
assert x.tzinfo == stamp.tzinfo
@@ -258,7 +258,7 @@ def test_index_convert_to_datetime_array_explicit_pytz(self):
258258
def _check_rng(rng):
259259
converted = rng.to_pydatetime()
260260
assert isinstance(converted, np.ndarray)
261-
for x, stamp in zip(converted, rng):
261+
for x, stamp in zip(converted, rng, strict=True):
262262
assert isinstance(x, datetime)
263263
assert x == stamp.to_pydatetime()
264264
assert x.tzinfo == stamp.tzinfo
@@ -275,7 +275,7 @@ def test_index_convert_to_datetime_array_dateutil(self):
275275
def _check_rng(rng):
276276
converted = rng.to_pydatetime()
277277
assert isinstance(converted, np.ndarray)
278-
for x, stamp in zip(converted, rng):
278+
for x, stamp in zip(converted, rng, strict=True):
279279
assert isinstance(x, datetime)
280280
assert x == stamp.to_pydatetime()
281281
assert x.tzinfo == stamp.tzinfo

pandas/tests/indexes/datetimes/test_formats.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def test_dti_representation(self, unit):
175175
)
176176

177177
with pd.option_context("display.width", 300):
178-
for index, expected in zip(idxs, exp):
178+
for index, expected in zip(idxs, exp, strict=True):
179179
index = index.as_unit(unit)
180180
expected = expected.replace("[ns", f"[{unit}")
181181
result = repr(index)
@@ -226,7 +226,7 @@ def test_dti_representation_to_series(self, unit):
226226
with pd.option_context("display.width", 300):
227227
for idx, expected in zip(
228228
[idx1, idx2, idx3, idx4, idx5, idx6, idx7],
229-
[exp1, exp2, exp3, exp4, exp5, exp6, exp7],
229+
[exp1, exp2, exp3, exp4, exp5, exp6, exp7], strict=True,
230230
):
231231
ser = Series(idx.as_unit(unit))
232232
result = repr(ser)
@@ -264,7 +264,7 @@ def test_dti_summary(self):
264264
exp6 = """DatetimeIndex: 3 entries, 2011-01-01 09:00:00-05:00 to NaT"""
265265

266266
for idx, expected in zip(
267-
[idx1, idx2, idx3, idx4, idx5, idx6], [exp1, exp2, exp3, exp4, exp5, exp6]
267+
[idx1, idx2, idx3, idx4, idx5, idx6], [exp1, exp2, exp3, exp4, exp5, exp6], strict=True
268268
):
269269
result = idx._summary()
270270
assert result == expected

pandas/tests/indexes/datetimes/test_partial_slicing.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ def test_partial_slicing_dataframe(self):
279279
# Timestamp with the same resolution as index
280280
# Should be exact match for Series (return scalar)
281281
# and raise KeyError for Frame
282-
for timestamp, expected in zip(index, values):
282+
for timestamp, expected in zip(index, values, strict=True):
283283
ts_string = timestamp.strftime(formats[rnum])
284284
# make ts_string as precise as index
285285
result = df["a"][ts_string]
@@ -319,7 +319,7 @@ def test_partial_slicing_dataframe(self):
319319

320320
# Not compatible with existing key
321321
# Should raise KeyError
322-
for fmt, res in list(zip(formats, resolutions))[rnum + 1 :]:
322+
for fmt, res in list(zip(formats, resolutions, strict=True))[rnum + 1 :]:
323323
ts = index[1] + Timedelta("1 " + res)
324324
ts_string = ts.strftime(fmt)
325325
msg = rf"^'{ts_string}'$"

pandas/tests/indexes/datetimes/test_scalar_compat.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def test_day_name_month_name(self, time_locale):
184184
"Saturday",
185185
"Sunday",
186186
]
187-
for day, name, eng_name in zip(range(4, 11), expected_days, english_days):
187+
for day, name, eng_name in zip(range(4, 11), expected_days, english_days, strict=True):
188188
name = name.capitalize()
189189
assert dti.day_name(locale=time_locale)[day] == name
190190
assert dti.day_name(locale=None)[day] == eng_name
@@ -206,7 +206,7 @@ def test_day_name_month_name(self, time_locale):
206206

207207
tm.assert_index_equal(result, expected)
208208

209-
for item, expected in zip(dti, expected_months):
209+
for item, expected in zip(dti, expected_months, strict=True):
210210
result = item.month_name(locale=time_locale)
211211
expected = expected.capitalize()
212212

pandas/tests/indexes/datetimes/test_timezones.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def test_timestamp_equality_different_timezones(self):
162162
eastern_range = utc_range.tz_convert("US/Eastern")
163163
berlin_range = utc_range.tz_convert("Europe/Berlin")
164164

165-
for a, b, c in zip(utc_range, eastern_range, berlin_range):
165+
for a, b, c in zip(utc_range, eastern_range, berlin_range, strict=True):
166166
assert a == b
167167
assert b == c
168168
assert a == c

pandas/tests/indexes/interval/test_constructors.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ def get_kwargs_from_breaks(self, breaks, closed="right"):
333333
if len(breaks) == 0:
334334
return {"data": breaks}
335335

336-
tuples = list(zip(breaks[:-1], breaks[1:]))
336+
tuples = list(zip(breaks[:-1], breaks[1:], strict=True))
337337
if isinstance(breaks, (list, tuple)):
338338
return {"data": tuples}
339339
elif isinstance(getattr(breaks, "dtype", None), CategoricalDtype):
@@ -386,7 +386,7 @@ def get_kwargs_from_breaks(self, breaks, closed="right"):
386386

387387
ivs = [
388388
Interval(left, right, closed) if notna(left) else left
389-
for left, right in zip(breaks[:-1], breaks[1:])
389+
for left, right in zip(breaks[:-1], breaks[1:], strict=True)
390390
]
391391

392392
if isinstance(breaks, list):

pandas/tests/indexes/interval/test_formats.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def test_repr_floats(self):
4545
Interval(left, right)
4646
for left, right in zip(
4747
Index([329.973, 345.137], dtype="float64"),
48-
Index([345.137, 360.191], dtype="float64"),
48+
Index([345.137, 360.191], dtype="float64"), strict=True,
4949
)
5050
]
5151
),

pandas/tests/indexes/interval/test_interval.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def test_properties(self, closed):
4949

5050
ivs = [
5151
Interval(left, right, closed)
52-
for left, right in zip(range(10), range(1, 11))
52+
for left, right in zip(range(10), range(1, 11), strict=True)
5353
]
5454
expected = np.array(ivs, dtype=object)
5555
tm.assert_numpy_array_equal(np.asarray(index), expected)
@@ -71,7 +71,7 @@ def test_properties(self, closed):
7171

7272
ivs = [
7373
Interval(left, right, closed) if notna(left) else np.nan
74-
for left, right in zip(expected_left, expected_right)
74+
for left, right in zip(expected_left, expected_right, strict=True)
7575
]
7676
expected = np.array(ivs, dtype=object)
7777
tm.assert_numpy_array_equal(np.asarray(index), expected)
@@ -789,14 +789,14 @@ def test_is_overlapping(self, start, shift, na_value, closed):
789789
@pytest.mark.parametrize(
790790
"tuples",
791791
[
792-
zip(range(10), range(1, 11)),
792+
zip(range(10), range(1, 11), strict=True),
793793
zip(
794794
date_range("20170101", periods=10),
795-
date_range("20170101", periods=10),
795+
date_range("20170101", periods=10), strict=True,
796796
),
797797
zip(
798798
timedelta_range("0 days", periods=10),
799-
timedelta_range("1 day", periods=10),
799+
timedelta_range("1 day", periods=10), strict=True,
800800
),
801801
],
802802
)
@@ -811,18 +811,18 @@ def test_to_tuples(self, tuples):
811811
@pytest.mark.parametrize(
812812
"tuples",
813813
[
814-
list(zip(range(10), range(1, 11))) + [np.nan],
814+
list(zip(range(10), range(1, 11), strict=True)) + [np.nan],
815815
list(
816816
zip(
817817
date_range("20170101", periods=10),
818-
date_range("20170101", periods=10),
818+
date_range("20170101", periods=10), strict=True,
819819
)
820820
)
821821
+ [np.nan],
822822
list(
823823
zip(
824824
timedelta_range("0 days", periods=10),
825-
timedelta_range("1 day", periods=10),
825+
timedelta_range("1 day", periods=10), strict=True,
826826
)
827827
)
828828
+ [np.nan],

pandas/tests/indexes/multi/test_analytics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def test_map(idx):
185185
@pytest.mark.parametrize(
186186
"mapper",
187187
[
188-
lambda values, idx: {i: e for e, i in zip(values, idx)},
188+
lambda values, idx: {i: e for e, i in zip(values, idx, strict=True)},
189189
lambda values, idx: pd.Series(values, idx),
190190
],
191191
)

0 commit comments

Comments
 (0)