Skip to content

Commit ebc80c7

Browse files
committed
CLN: Remove python2-style longs in rexex
1 parent bb0376c commit ebc80c7

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

pandas/tests/indexing/multiindex/test_getitem.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ def test_series_getitem_returns_scalar(
8383

8484

8585
@pytest.mark.parametrize('indexer,expected_error,expected_error_msg', [
86-
(lambda s: s.__getitem__((2000, 3, 4)), KeyError, r"^356L?$"),
87-
(lambda s: s[(2000, 3, 4)], KeyError, r"^356L?$"),
88-
(lambda s: s.loc[(2000, 3, 4)], KeyError, r"^356L?$"),
86+
(lambda s: s.__getitem__((2000, 3, 4)), KeyError, r"^356$"),
87+
(lambda s: s[(2000, 3, 4)], KeyError, r"^356$"),
88+
(lambda s: s.loc[(2000, 3, 4)], KeyError, r"^356$"),
8989
(lambda s: s.loc[(2000, 3, 4, 5)], IndexingError, 'Too many indexers'),
9090
(lambda s: s.__getitem__(len(s)), IndexError, 'index out of bounds'),
9191
(lambda s: s[len(s)], IndexError, 'index out of bounds'),

pandas/tests/indexing/multiindex/test_loc.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ def test_loc_multiindex(self):
124124
tm.assert_frame_equal(rs, xp)
125125

126126
# missing label
127-
with pytest.raises(KeyError, match=r"^2L?$"):
127+
with pytest.raises(KeyError, match=r"^2$"):
128128
mi_int.loc[2]
129129
with catch_warnings(record=True):
130130
# GH 21593
131-
with pytest.raises(KeyError, match=r"^2L?$"):
131+
with pytest.raises(KeyError, match=r"^2$"):
132132
mi_int.ix[2]
133133

134134
def test_loc_multiindex_too_many_dims(self):
@@ -375,15 +375,15 @@ def test_loc_getitem_int(frame_random_data_integer_multi_index):
375375
def test_loc_getitem_int_raises_exception(
376376
frame_random_data_integer_multi_index):
377377
df = frame_random_data_integer_multi_index
378-
with pytest.raises(KeyError, match=r"^3L?$"):
378+
with pytest.raises(KeyError, match=r"^3$"):
379379
df.loc[3]
380380

381381

382382
def test_loc_getitem_lowerdim_corner(multiindex_dataframe_random_data):
383383
df = multiindex_dataframe_random_data
384384

385385
# test setup - check key not in dataframe
386-
with pytest.raises(KeyError, match=r"^11L?$"):
386+
with pytest.raises(KeyError, match=r"^11$"):
387387
df.loc[('bar', 'three'), 'B']
388388

389389
# in theory should be inserting in a sorted space????

pandas/tests/series/indexing/test_datetime.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ def test_datetime_indexing():
406406
s = Series(len(index), index=index)
407407
stamp = Timestamp('1/8/2000')
408408

409-
with pytest.raises(KeyError, match=r"^947289600000000000L?$"):
409+
with pytest.raises(KeyError, match=r"^947289600000000000$"):
410410
s[stamp]
411411
s[stamp] = 0
412412
assert s[stamp] == 0
@@ -415,7 +415,7 @@ def test_datetime_indexing():
415415
s = Series(len(index), index=index)
416416
s = s[::-1]
417417

418-
with pytest.raises(KeyError, match=r"^947289600000000000L?$"):
418+
with pytest.raises(KeyError, match=r"^947289600000000000$"):
419419
s[stamp]
420420
s[stamp] = 0
421421
assert s[stamp] == 0
@@ -507,7 +507,7 @@ def test_duplicate_dates_indexing(dups):
507507
expected = Series(np.where(mask, 0, ts), index=ts.index)
508508
assert_series_equal(cp, expected)
509509

510-
with pytest.raises(KeyError, match=r"^947116800000000000L?$"):
510+
with pytest.raises(KeyError, match=r"^947116800000000000$"):
511511
ts[datetime(2000, 1, 6)]
512512

513513
# new index

pandas/tests/series/indexing/test_indexing.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,9 @@ def test_series_box_timestamp():
256256

257257
def test_getitem_ambiguous_keyerror():
258258
s = Series(lrange(10), index=lrange(0, 20, 2))
259-
with pytest.raises(KeyError, match=r"^1L?$"):
259+
with pytest.raises(KeyError, match=r"^1$"):
260260
s[1]
261-
with pytest.raises(KeyError, match=r"^1L?$"):
261+
with pytest.raises(KeyError, match=r"^1$"):
262262
s.loc[1]
263263

264264

pandas/tests/series/indexing/test_loc.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ def test_loc_getitem_setitem_integer_slice_keyerrors():
7474

7575
# non-monotonic, raise KeyError
7676
s2 = s.iloc[lrange(5) + lrange(5, 10)[::-1]]
77-
with pytest.raises(KeyError, match=r"^3L?$"):
77+
with pytest.raises(KeyError, match=r"^3$"):
7878
s2.loc[3:11]
79-
with pytest.raises(KeyError, match=r"^3L?$"):
79+
with pytest.raises(KeyError, match=r"^3$"):
8080
s2.loc[3:11] = 0
8181

8282

pandas/tests/series/test_analytics.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ def test_dot(self):
471471
assert_almost_equal(a.dot(b['1']), expected['1'])
472472
assert_almost_equal(a.dot(b2['1']), expected['1'])
473473

474-
msg = r"Dot product shape mismatch, \(4L?,\) vs \(3L?,\)"
474+
msg = r"Dot product shape mismatch, \(4,\) vs \(3,\)"
475475
# exception raised is of type Exception
476476
with pytest.raises(Exception, match=msg):
477477
a.dot(a.values[:3])

0 commit comments

Comments
 (0)