Skip to content

Commit cf1a633

Browse files
committed
CLN: remove compat.lrange
1 parent 23b6115 commit cf1a633

21 files changed

+287
-268
lines changed

pandas/tests/dtypes/test_inference.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import pytz
1717

1818
from pandas._libs import iNaT, lib, missing as libmissing
19-
from pandas.compat import lrange
2019
import pandas.util._test_decorators as td
2120

2221
from pandas.core.dtypes import inference
@@ -1302,8 +1301,7 @@ def test_datetimeindex_from_empty_datetime64_array():
13021301
def test_nan_to_nat_conversions():
13031302

13041303
df = DataFrame(dict({
1305-
'A': np.asarray(
1306-
lrange(10), dtype='float64'),
1304+
'A': np.asarray(range(10), dtype='float64'),
13071305
'B': Timestamp('20010101')
13081306
}))
13091307
df.iloc[3:6, :] = np.nan

pandas/tests/frame/test_alter_axes.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import numpy as np
55
import pytest
66

7-
from pandas.compat import lrange
8-
97
from pandas.core.dtypes.common import (
108
is_categorical_dtype, is_interval_dtype, is_object_dtype)
119

@@ -1091,13 +1089,13 @@ def test_reset_index_multiindex_col(self):
10911089
tm.assert_frame_equal(rs, xp)
10921090

10931091
rs = df.reset_index('a', col_fill=None)
1094-
xp = DataFrame(full, Index(lrange(3), name='d'),
1092+
xp = DataFrame(full, Index(range(3), name='d'),
10951093
columns=[['a', 'b', 'b', 'c'],
10961094
['a', 'mean', 'median', 'mean']])
10971095
tm.assert_frame_equal(rs, xp)
10981096

10991097
rs = df.reset_index('a', col_fill='blah', col_level=1)
1100-
xp = DataFrame(full, Index(lrange(3), name='d'),
1098+
xp = DataFrame(full, Index(range(3), name='d'),
11011099
columns=[['blah', 'b', 'b', 'c'],
11021100
['a', 'mean', 'median', 'mean']])
11031101
tm.assert_frame_equal(rs, xp)

pandas/tests/frame/test_analytics.py

+9-10
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import numpy as np
77
import pytest
88

9-
from pandas.compat import lrange
109
import pandas.util._test_decorators as td
1110

1211
import pandas as pd
@@ -54,7 +53,7 @@ def assert_stat_op_calc(opname, alternative, frame, has_skipna=True,
5453
result = getattr(df, opname)()
5554
assert isinstance(result, Series)
5655

57-
df['a'] = lrange(len(df))
56+
df['a'] = range(len(df))
5857
result = getattr(df, opname)()
5958
assert isinstance(result, Series)
6059
assert len(result)
@@ -1203,7 +1202,7 @@ def test_stats_mixed_type(self, float_string_frame):
12031202
float_string_frame.skew(1)
12041203

12051204
def test_sum_bools(self):
1206-
df = DataFrame(index=lrange(1), columns=lrange(10))
1205+
df = DataFrame(index=range(1), columns=range(10))
12071206
bools = isna(df)
12081207
assert bools.sum(axis=1)[0] == 10
12091208

@@ -1212,7 +1211,7 @@ def test_sum_bools(self):
12121211

12131212
def test_cumsum_corner(self):
12141213
dm = DataFrame(np.arange(20).reshape(4, 5),
1215-
index=lrange(4), columns=lrange(5))
1214+
index=range(4), columns=range(5))
12161215
# ?(wesm)
12171216
result = dm.cumsum() # noqa
12181217

@@ -1327,12 +1326,12 @@ def test_count(self):
13271326
assert isinstance(ct2, Series)
13281327

13291328
# GH#423
1330-
df = DataFrame(index=lrange(10))
1329+
df = DataFrame(index=range(10))
13311330
result = df.count(1)
13321331
expected = Series(0, index=df.index)
13331332
tm.assert_series_equal(result, expected)
13341333

1335-
df = DataFrame(columns=lrange(10))
1334+
df = DataFrame(columns=range(10))
13361335
result = df.count(0)
13371336
expected = Series(0, index=df.columns)
13381337
tm.assert_series_equal(result, expected)
@@ -2137,9 +2136,9 @@ def test_dot(self):
21372136

21382137
# unaligned
21392138
df = DataFrame(np.random.randn(3, 4),
2140-
index=[1, 2, 3], columns=lrange(4))
2139+
index=[1, 2, 3], columns=range(4))
21412140
df2 = DataFrame(np.random.randn(5, 3),
2142-
index=lrange(5), columns=[1, 2, 3])
2141+
index=range(5), columns=[1, 2, 3])
21432142

21442143
with pytest.raises(ValueError, match='aligned'):
21452144
df.dot(df2)
@@ -2197,9 +2196,9 @@ def test_matmul(self):
21972196

21982197
# unaligned
21992198
df = DataFrame(np.random.randn(3, 4),
2200-
index=[1, 2, 3], columns=lrange(4))
2199+
index=[1, 2, 3], columns=range(4))
22012200
df2 = DataFrame(np.random.randn(5, 3),
2202-
index=lrange(5), columns=[1, 2, 3])
2201+
index=range(5), columns=[1, 2, 3])
22032202

22042203
with pytest.raises(ValueError, match='aligned'):
22052204
operator.matmul(df, df2)

pandas/tests/frame/test_api.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import numpy as np
55
import pytest
66

7-
from pandas.compat import lrange
8-
97
import pandas as pd
108
from pandas import (
119
Categorical, DataFrame, Series, SparseDataFrame, compat, date_range,
@@ -234,7 +232,7 @@ def test_itertuples(self, float_frame):
234232
self._assert_series_equal(s, expected)
235233

236234
df = self.klass({'floats': np.random.randn(5),
237-
'ints': lrange(5)}, columns=['floats', 'ints'])
235+
'ints': range(5)}, columns=['floats', 'ints'])
238236

239237
for tup in df.itertuples(index=False):
240238
assert isinstance(tup[1], int)

pandas/tests/frame/test_axis_select_reindex.py

+19-20
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import numpy as np
44
import pytest
55

6-
from pandas.compat import lrange
76
from pandas.errors import PerformanceWarning
87

98
import pandas as pd
@@ -393,44 +392,44 @@ def test_reindex_fill_value(self):
393392
df = DataFrame(np.random.randn(10, 4))
394393

395394
# axis=0
396-
result = df.reindex(lrange(15))
395+
result = df.reindex(list(range(15)))
397396
assert np.isnan(result.values[-5:]).all()
398397

399-
result = df.reindex(lrange(15), fill_value=0)
400-
expected = df.reindex(lrange(15)).fillna(0)
398+
result = df.reindex(range(15), fill_value=0)
399+
expected = df.reindex(range(15)).fillna(0)
401400
assert_frame_equal(result, expected)
402401

403402
# axis=1
404-
result = df.reindex(columns=lrange(5), fill_value=0.)
403+
result = df.reindex(columns=range(5), fill_value=0.)
405404
expected = df.copy()
406405
expected[4] = 0.
407406
assert_frame_equal(result, expected)
408407

409-
result = df.reindex(columns=lrange(5), fill_value=0)
408+
result = df.reindex(columns=range(5), fill_value=0)
410409
expected = df.copy()
411410
expected[4] = 0
412411
assert_frame_equal(result, expected)
413412

414-
result = df.reindex(columns=lrange(5), fill_value='foo')
413+
result = df.reindex(columns=range(5), fill_value='foo')
415414
expected = df.copy()
416415
expected[4] = 'foo'
417416
assert_frame_equal(result, expected)
418417

419418
# reindex_axis
420419
with tm.assert_produces_warning(FutureWarning):
421-
result = df.reindex_axis(lrange(15), fill_value=0., axis=0)
422-
expected = df.reindex(lrange(15)).fillna(0)
420+
result = df.reindex_axis(range(15), fill_value=0., axis=0)
421+
expected = df.reindex(range(15)).fillna(0)
423422
assert_frame_equal(result, expected)
424423

425424
with tm.assert_produces_warning(FutureWarning):
426-
result = df.reindex_axis(lrange(5), fill_value=0., axis=1)
427-
expected = df.reindex(columns=lrange(5)).fillna(0)
425+
result = df.reindex_axis(range(5), fill_value=0., axis=1)
426+
expected = df.reindex(columns=range(5)).fillna(0)
428427
assert_frame_equal(result, expected)
429428

430429
# other dtypes
431430
df['foo'] = 'foo'
432-
result = df.reindex(lrange(15), fill_value=0)
433-
expected = df.reindex(lrange(15)).fillna(0)
431+
result = df.reindex(range(15), fill_value=0)
432+
expected = df.reindex(range(15)).fillna(0)
434433
assert_frame_equal(result, expected)
435434

436435
def test_reindex_dups(self):
@@ -1025,7 +1024,7 @@ def test_reindex_boolean(self):
10251024
assert reindexed.values.dtype == np.object_
10261025
assert isna(reindexed[0][1])
10271026

1028-
reindexed = frame.reindex(columns=lrange(3))
1027+
reindexed = frame.reindex(columns=range(3))
10291028
assert reindexed.values.dtype == np.object_
10301029
assert isna(reindexed[1]).all()
10311030

@@ -1093,22 +1092,22 @@ def test_reindex_with_nans(self):
10931092
def test_reindex_multi(self):
10941093
df = DataFrame(np.random.randn(3, 3))
10951094

1096-
result = df.reindex(index=lrange(4), columns=lrange(4))
1097-
expected = df.reindex(lrange(4)).reindex(columns=lrange(4))
1095+
result = df.reindex(index=range(4), columns=range(4))
1096+
expected = df.reindex(list(range(4))).reindex(columns=range(4))
10981097

10991098
assert_frame_equal(result, expected)
11001099

11011100
df = DataFrame(np.random.randint(0, 10, (3, 3)))
11021101

1103-
result = df.reindex(index=lrange(4), columns=lrange(4))
1104-
expected = df.reindex(lrange(4)).reindex(columns=lrange(4))
1102+
result = df.reindex(index=range(4), columns=range(4))
1103+
expected = df.reindex(list(range(4))).reindex(columns=range(4))
11051104

11061105
assert_frame_equal(result, expected)
11071106

11081107
df = DataFrame(np.random.randint(0, 10, (3, 3)))
11091108

1110-
result = df.reindex(index=lrange(2), columns=lrange(2))
1111-
expected = df.reindex(lrange(2)).reindex(columns=lrange(2))
1109+
result = df.reindex(index=range(2), columns=range(2))
1110+
expected = df.reindex(range(2)).reindex(columns=range(2))
11121111

11131112
assert_frame_equal(result, expected)
11141113

pandas/tests/frame/test_combine_concat.py

+17-19
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import numpy as np
44
import pytest
55

6-
from pandas.compat import lrange
7-
86
import pandas as pd
97
from pandas import DataFrame, Index, Series, Timestamp, date_range
108
import pandas.util.testing as tm
@@ -216,41 +214,41 @@ def test_append_dtypes(self):
216214
# row appends of different dtypes (so need to do by-item)
217215
# can sometimes infer the correct type
218216

219-
df1 = DataFrame({'bar': Timestamp('20130101')}, index=lrange(5))
217+
df1 = DataFrame({'bar': Timestamp('20130101')}, index=range(5))
220218
df2 = DataFrame()
221219
result = df1.append(df2)
222220
expected = df1.copy()
223221
assert_frame_equal(result, expected)
224222

225-
df1 = DataFrame({'bar': Timestamp('20130101')}, index=lrange(1))
226-
df2 = DataFrame({'bar': 'foo'}, index=lrange(1, 2))
223+
df1 = DataFrame({'bar': Timestamp('20130101')}, index=range(1))
224+
df2 = DataFrame({'bar': 'foo'}, index=range(1, 2))
227225
result = df1.append(df2)
228226
expected = DataFrame({'bar': [Timestamp('20130101'), 'foo']})
229227
assert_frame_equal(result, expected)
230228

231-
df1 = DataFrame({'bar': Timestamp('20130101')}, index=lrange(1))
232-
df2 = DataFrame({'bar': np.nan}, index=lrange(1, 2))
229+
df1 = DataFrame({'bar': Timestamp('20130101')}, index=range(1))
230+
df2 = DataFrame({'bar': np.nan}, index=range(1, 2))
233231
result = df1.append(df2)
234232
expected = DataFrame(
235233
{'bar': Series([Timestamp('20130101'), np.nan], dtype='M8[ns]')})
236234
assert_frame_equal(result, expected)
237235

238-
df1 = DataFrame({'bar': Timestamp('20130101')}, index=lrange(1))
239-
df2 = DataFrame({'bar': np.nan}, index=lrange(1, 2), dtype=object)
236+
df1 = DataFrame({'bar': Timestamp('20130101')}, index=range(1))
237+
df2 = DataFrame({'bar': np.nan}, index=range(1, 2), dtype=object)
240238
result = df1.append(df2)
241239
expected = DataFrame(
242240
{'bar': Series([Timestamp('20130101'), np.nan], dtype='M8[ns]')})
243241
assert_frame_equal(result, expected)
244242

245-
df1 = DataFrame({'bar': np.nan}, index=lrange(1))
246-
df2 = DataFrame({'bar': Timestamp('20130101')}, index=lrange(1, 2))
243+
df1 = DataFrame({'bar': np.nan}, index=range(1))
244+
df2 = DataFrame({'bar': Timestamp('20130101')}, index=range(1, 2))
247245
result = df1.append(df2)
248246
expected = DataFrame(
249247
{'bar': Series([np.nan, Timestamp('20130101')], dtype='M8[ns]')})
250248
assert_frame_equal(result, expected)
251249

252-
df1 = DataFrame({'bar': Timestamp('20130101')}, index=lrange(1))
253-
df2 = DataFrame({'bar': 1}, index=lrange(1, 2), dtype=object)
250+
df1 = DataFrame({'bar': Timestamp('20130101')}, index=range(1))
251+
df2 = DataFrame({'bar': 1}, index=range(1, 2), dtype=object)
254252
result = df1.append(df2)
255253
expected = DataFrame({'bar': Series([Timestamp('20130101'), 1])})
256254
assert_frame_equal(result, expected)
@@ -379,7 +377,7 @@ def test_join_str_datetime(self):
379377
str_dates = ['20120209', '20120222']
380378
dt_dates = [datetime(2012, 2, 9), datetime(2012, 2, 22)]
381379

382-
A = DataFrame(str_dates, index=lrange(2), columns=['aa'])
380+
A = DataFrame(str_dates, index=range(2), columns=['aa'])
383381
C = DataFrame([[1, 2], [3, 4]], index=str_dates, columns=dt_dates)
384382

385383
tst = A.join(C, on='aa')
@@ -535,12 +533,12 @@ def test_concat_astype_dup_col(self):
535533
class TestDataFrameCombineFirst():
536534

537535
def test_combine_first_mixed(self):
538-
a = Series(['a', 'b'], index=lrange(2))
539-
b = Series(lrange(2), index=lrange(2))
536+
a = Series(['a', 'b'], index=range(2))
537+
b = Series(range(2), index=range(2))
540538
f = DataFrame({'A': a, 'B': b})
541539

542-
a = Series(['a', 'b'], index=lrange(5, 7))
543-
b = Series(lrange(2), index=lrange(5, 7))
540+
a = Series(['a', 'b'], index=range(5, 7))
541+
b = Series(range(2), index=range(5, 7))
544542
g = DataFrame({'A': a, 'B': b})
545543

546544
exp = pd.DataFrame({'A': list('abab'), 'B': [0., 1., 0., 1.]},
@@ -861,7 +859,7 @@ def test_concat_datetime_datetime64_frame(self):
861859
df2_obj = DataFrame.from_records(rows, columns=['date', 'test'])
862860

863861
ind = date_range(start="2000/1/1", freq="D", periods=10)
864-
df1 = DataFrame({'date': ind, 'test': lrange(10)})
862+
df1 = DataFrame({'date': ind, 'test': range(10)})
865863

866864
# it works!
867865
pd.concat([df1, df2_obj])

0 commit comments

Comments
 (0)