Skip to content

Commit 5d46902

Browse files
h-vetinarih-vetinari
committed
Clean imports for frame/test_arithmetic.py
1 parent ba331cd commit 5d46902

File tree

1 file changed

+40
-39
lines changed

1 file changed

+40
-39
lines changed

‎pandas/tests/frame/test_arithmetic.py

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
from pandas.compat import range
88

9-
import pandas as pd
9+
from pandas import (DataFrame, Series, Timedelta,
10+
date_range, timedelta_range, NaT)
11+
1012
import pandas.util.testing as tm
1113

1214
from pandas.tests.frame.common import _check_mixed_float, _check_mixed_int
@@ -17,29 +19,29 @@
1719

1820
class TestFrameComparisons(object):
1921
def test_flex_comparison_nat(self):
20-
# GH#15697, GH#22163 df.eq(pd.NaT) should behave like df == pd.NaT,
22+
# GH#15697, GH#22163 df.eq(NaT) should behave like df == NaT,
2123
# and _definitely_ not be NaN
22-
df = pd.DataFrame([pd.NaT])
24+
df = DataFrame([NaT])
2325

24-
result = df == pd.NaT
26+
result = df == NaT
2527
# result.iloc[0, 0] is a np.bool_ object
2628
assert result.iloc[0, 0].item() is False
2729

28-
result = df.eq(pd.NaT)
30+
result = df.eq(NaT)
2931
assert result.iloc[0, 0].item() is False
3032

31-
result = df != pd.NaT
33+
result = df != NaT
3234
assert result.iloc[0, 0].item() is True
3335

34-
result = df.ne(pd.NaT)
36+
result = df.ne(NaT)
3537
assert result.iloc[0, 0].item() is True
3638

3739
def test_mixed_comparison(self):
3840
# GH#13128, GH#22163 != datetime64 vs non-dt64 should be False,
3941
# not raise TypeError
4042
# (this appears to be fixed before #22163, not sure when)
41-
df = pd.DataFrame([['1989-08-01', 1], ['1989-08-01', 2]])
42-
other = pd.DataFrame([['a', 'b'], ['c', 'd']])
43+
df = DataFrame([['1989-08-01', 1], ['1989-08-01', 2]])
44+
other = DataFrame([['a', 'b'], ['c', 'd']])
4345

4446
result = df == other
4547
assert not result.any().any()
@@ -50,7 +52,7 @@ def test_mixed_comparison(self):
5052
def test_df_boolean_comparison_error(self):
5153
# GH#4576
5254
# boolean comparisons with a tuple/list give unexpected results
53-
df = pd.DataFrame(np.arange(6).reshape((3, 2)))
55+
df = DataFrame(np.arange(6).reshape((3, 2)))
5456

5557
# not shape compatible
5658
with pytest.raises(ValueError):
@@ -59,14 +61,14 @@ def test_df_boolean_comparison_error(self):
5961
df == [2, 2]
6062

6163
def test_df_float_none_comparison(self):
62-
df = pd.DataFrame(np.random.randn(8, 3), index=range(8),
63-
columns=['A', 'B', 'C'])
64+
df = DataFrame(np.random.randn(8, 3), index=range(8),
65+
columns=['A', 'B', 'C'])
6466

6567
result = df.__eq__(None)
6668
assert not result.any().any()
6769

6870
def test_df_string_comparison(self):
69-
df = pd.DataFrame([{"a": 1, "b": "foo"}, {"a": 2, "b": "bar"}])
71+
df = DataFrame([{"a": 1, "b": "foo"}, {"a": 2, "b": "bar"}])
7072
mask_a = df.a > 1
7173
tm.assert_frame_equal(df[mask_a], df.loc[1:1, :])
7274
tm.assert_frame_equal(df[-mask_a], df.loc[0:0, :])
@@ -78,21 +80,21 @@ def test_df_string_comparison(self):
7880
@pytest.mark.parametrize('opname', ['eq', 'ne', 'gt', 'lt', 'ge', 'le'])
7981
def test_df_flex_cmp_constant_return_types(self, opname):
8082
# GH#15077, non-empty DataFrame
81-
df = pd.DataFrame({'x': [1, 2, 3], 'y': [1., 2., 3.]})
83+
df = DataFrame({'x': [1, 2, 3], 'y': [1., 2., 3.]})
8284
const = 2
8385

8486
result = getattr(df, opname)(const).get_dtype_counts()
85-
tm.assert_series_equal(result, pd.Series([2], ['bool']))
87+
tm.assert_series_equal(result, Series([2], ['bool']))
8688

8789
@pytest.mark.parametrize('opname', ['eq', 'ne', 'gt', 'lt', 'ge', 'le'])
8890
def test_df_flex_cmp_constant_return_types_empty(self, opname):
8991
# GH#15077 empty DataFrame
90-
df = pd.DataFrame({'x': [1, 2, 3], 'y': [1., 2., 3.]})
92+
df = DataFrame({'x': [1, 2, 3], 'y': [1., 2., 3.]})
9193
const = 2
9294

9395
empty = df.iloc[:0]
9496
result = getattr(empty, opname)(const).get_dtype_counts()
95-
tm.assert_series_equal(result, pd.Series([2], ['bool']))
97+
tm.assert_series_equal(result, Series([2], ['bool']))
9698

9799

98100
# -------------------------------------------------------------------
@@ -101,28 +103,27 @@ def test_df_flex_cmp_constant_return_types_empty(self, opname):
101103
class TestFrameFlexArithmetic(object):
102104
def test_df_add_td64_columnwise(self):
103105
# GH#22534 Check that column-wise addition broadcasts correctly
104-
dti = pd.date_range('2016-01-01', periods=10)
105-
tdi = pd.timedelta_range('1', periods=10)
106-
tser = pd.Series(tdi)
107-
df = pd.DataFrame({0: dti, 1: tdi})
106+
dti = date_range('2016-01-01', periods=10)
107+
tdi = timedelta_range('1', periods=10)
108+
tser = Series(tdi)
109+
df = DataFrame({0: dti, 1: tdi})
108110

109111
result = df.add(tser, axis=0)
110-
expected = pd.DataFrame({0: dti + tdi,
111-
1: tdi + tdi})
112+
expected = DataFrame({0: dti + tdi, 1: tdi + tdi})
112113
tm.assert_frame_equal(result, expected)
113114

114115
def test_df_add_flex_filled_mixed_dtypes(self):
115116
# GH#19611
116-
dti = pd.date_range('2016-01-01', periods=3)
117-
ser = pd.Series(['1 Day', 'NaT', '2 Days'], dtype='timedelta64[ns]')
118-
df = pd.DataFrame({'A': dti, 'B': ser})
119-
other = pd.DataFrame({'A': ser, 'B': ser})
120-
fill = pd.Timedelta(days=1).to_timedelta64()
117+
dti = date_range('2016-01-01', periods=3)
118+
ser = Series(['1 Day', 'NaT', '2 Days'], dtype='timedelta64[ns]')
119+
df = DataFrame({'A': dti, 'B': ser})
120+
other = DataFrame({'A': ser, 'B': ser})
121+
fill = Timedelta(days=1).to_timedelta64()
121122
result = df.add(other, fill_value=fill)
122123

123-
expected = pd.DataFrame(
124-
{'A': pd.Series(['2016-01-02', '2016-01-03', '2016-01-05'],
125-
dtype='datetime64[ns]'),
124+
expected = DataFrame(
125+
{'A': Series(['2016-01-02', '2016-01-03', '2016-01-05'],
126+
dtype='datetime64[ns]'),
126127
'B': ser * 2})
127128
tm.assert_frame_equal(result, expected)
128129

@@ -225,22 +226,22 @@ def test_arith_flex_series(self, simple_frame):
225226
tm.assert_frame_equal(df.div(col, axis=0), (df.T / col).T)
226227

227228
# broadcasting issue in GH#7325
228-
df = pd.DataFrame(np.arange(3 * 2).reshape((3, 2)), dtype='int64')
229-
expected = pd.DataFrame([[np.nan, np.inf], [1.0, 1.5], [1.0, 1.25]])
229+
df = DataFrame(np.arange(3 * 2).reshape((3, 2)), dtype='int64')
230+
expected = DataFrame([[np.nan, np.inf], [1.0, 1.5], [1.0, 1.25]])
230231
result = df.div(df[0], axis='index')
231232
tm.assert_frame_equal(result, expected)
232233

233-
df = pd.DataFrame(np.arange(3 * 2).reshape((3, 2)), dtype='float64')
234-
expected = pd.DataFrame([[np.nan, np.inf], [1.0, 1.5], [1.0, 1.25]])
234+
df = DataFrame(np.arange(3 * 2).reshape((3, 2)), dtype='float64')
235+
expected = DataFrame([[np.nan, np.inf], [1.0, 1.5], [1.0, 1.25]])
235236
result = df.div(df[0], axis='index')
236237
tm.assert_frame_equal(result, expected)
237238

238239
def test_arith_flex_zero_len_raises(self):
239240
# GH#19522 passing fill_value to frame flex arith methods should
240241
# raise even in the zero-length special cases
241-
ser_len0 = pd.Series([])
242-
df_len0 = pd.DataFrame([], columns=['A', 'B'])
243-
df = pd.DataFrame([[1, 2], [3, 4]], columns=['A', 'B'])
242+
ser_len0 = Series([])
243+
df_len0 = DataFrame([], columns=['A', 'B'])
244+
df = DataFrame([[1, 2], [3, 4]], columns=['A', 'B'])
244245

245246
with tm.assert_raises_regex(NotImplementedError, 'fill_value'):
246247
df.add(ser_len0, fill_value='E')
@@ -253,7 +254,7 @@ class TestFrameArithmetic(object):
253254
def test_df_bool_mul_int(self):
254255
# GH#22047, GH#22163 multiplication by 1 should result in int dtype,
255256
# not object dtype
256-
df = pd.DataFrame([[False, True], [False, False]])
257+
df = DataFrame([[False, True], [False, False]])
257258
result = df * 1
258259

259260
# On appveyor this comes back as np.int32 instead of np.int64,

0 commit comments

Comments
 (0)