Skip to content

Commit 99a55df

Browse files
committed
Clean up imports for test_api
1 parent c2ab4b5 commit 99a55df

File tree

1 file changed

+20
-24
lines changed

1 file changed

+20
-24
lines changed

pandas/tests/frame/test_api.py

+20-24
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,8 @@
1414
from numpy.random import randn
1515
import numpy as np
1616

17-
from pandas import (DataFrame, Series, date_range, timedelta_range,
18-
Categorical, SparseDataFrame)
19-
import pandas as pd
20-
21-
from pandas.util.testing import (assert_almost_equal,
22-
assert_series_equal,
23-
assert_frame_equal)
17+
from pandas import (DataFrame, Series, Index, MultiIndex, date_range, NaT,
18+
timedelta_range, Timestamp, Categorical, SparseDataFrame)
2419

2520
import pandas.util.testing as tm
2621

@@ -75,19 +70,19 @@ def test_get_value(self, float_frame):
7570

7671
def test_add_prefix_suffix(self, float_frame):
7772
with_prefix = float_frame.add_prefix('foo#')
78-
expected = pd.Index(['foo#%s' % c for c in float_frame.columns])
73+
expected = Index(['foo#%s' % c for c in float_frame.columns])
7974
tm.assert_index_equal(with_prefix.columns, expected)
8075

8176
with_suffix = float_frame.add_suffix('#foo')
82-
expected = pd.Index(['%s#foo' % c for c in float_frame.columns])
77+
expected = Index(['%s#foo' % c for c in float_frame.columns])
8378
tm.assert_index_equal(with_suffix.columns, expected)
8479

8580
with_pct_prefix = float_frame.add_prefix('%')
86-
expected = pd.Index(['%{}'.format(c) for c in float_frame.columns])
81+
expected = Index(['%{}'.format(c) for c in float_frame.columns])
8782
tm.assert_index_equal(with_pct_prefix.columns, expected)
8883

8984
with_pct_suffix = float_frame.add_suffix('%')
90-
expected = pd.Index(['{}%'.format(c) for c in float_frame.columns])
85+
expected = Index(['{}%'.format(c) for c in float_frame.columns])
9186
tm.assert_index_equal(with_pct_suffix.columns, expected)
9287

9388
def test_get_axis(self, float_frame):
@@ -128,21 +123,21 @@ def test_column_contains_typeerror(self, float_frame):
128123

129124
def test_tab_completion(self):
130125
# DataFrame whose columns are identifiers shall have them in __dir__.
131-
df = pd.DataFrame([list('abcd'), list('efgh')], columns=list('ABCD'))
126+
df = DataFrame([list('abcd'), list('efgh')], columns=list('ABCD'))
132127
for key in list('ABCD'):
133128
assert key in dir(df)
134-
assert isinstance(df.__getitem__('A'), pd.Series)
129+
assert isinstance(df.__getitem__('A'), Series)
135130

136131
# DataFrame whose first-level columns are identifiers shall have
137132
# them in __dir__.
138-
df = pd.DataFrame(
139-
[list('abcd'), list('efgh')],
140-
columns=pd.MultiIndex.from_tuples(list(zip('ABCD', 'EFGH'))))
133+
df = DataFrame([list('abcd'), list('efgh')],
134+
columns=MultiIndex.from_tuples(list(zip('ABCD',
135+
'EFGH'))))
141136
for key in list('ABCD'):
142137
assert key in dir(df)
143138
for key in list('EFGH'):
144139
assert key not in dir(df)
145-
assert isinstance(df.__getitem__('A'), pd.DataFrame)
140+
assert isinstance(df.__getitem__('A'), DataFrame)
146141

147142
def test_not_hashable(self, empty_frame):
148143
df = self.klass([1])
@@ -314,7 +309,7 @@ def test_values(self, float_frame, float_string_frame):
314309
# single block corner case
315310
arr = float_frame[['A', 'B']].values
316311
expected = float_frame.reindex(columns=['A', 'B']).values
317-
assert_almost_equal(arr, expected)
312+
tm.assert_almost_equal(arr, expected)
318313

319314
def test_transpose(self, float_frame):
320315
frame = float_frame
@@ -347,11 +342,11 @@ def test_axis_aliases(self, float_frame):
347342
# reg name
348343
expected = f.sum(axis=0)
349344
result = f.sum(axis='index')
350-
assert_series_equal(result, expected)
345+
tm.assert_series_equal(result, expected)
351346

352347
expected = f.sum(axis=1)
353348
result = f.sum(axis='columns')
354-
assert_series_equal(result, expected)
349+
tm.assert_series_equal(result, expected)
355350

356351
def test_class_axis(self):
357352
# https://github.com/pandas-dev/pandas/issues/18147
@@ -365,7 +360,7 @@ def test_more_values(self, float_string_frame):
365360

366361
def test_repr_with_mi_nat(self, float_string_frame):
367362
df = self.klass({'X': [1, 2]},
368-
index=[[pd.NaT, pd.Timestamp('20130101')], ['a', 'b']])
363+
index=[[NaT, Timestamp('20130101')], ['a', 'b']])
369364
res = repr(df)
370365
exp = ' X\nNaT a 1\n2013-01-01 b 2'
371366
assert res == exp
@@ -410,8 +405,8 @@ class TestDataFrameMisc(SharedWithSparse):
410405

411406
klass = DataFrame
412407
# SharedWithSparse tests use generic, klass-agnostic assertion
413-
_assert_frame_equal = staticmethod(assert_frame_equal)
414-
_assert_series_equal = staticmethod(assert_series_equal)
408+
_assert_frame_equal = staticmethod(tm.assert_frame_equal)
409+
_assert_series_equal = staticmethod(tm.assert_series_equal)
415410

416411
def test_values(self, float_frame):
417412
float_frame.values[:, 0] = 5.
@@ -420,7 +415,8 @@ def test_values(self, float_frame):
420415
def test_as_matrix_deprecated(self, float_frame):
421416
# GH 18458
422417
with tm.assert_produces_warning(FutureWarning):
423-
result = float_frame.as_matrix(columns=float_frame.columns.tolist())
418+
cols = float_frame.columns.tolist()
419+
result = float_frame.as_matrix(columns=cols)
424420
expected = float_frame.values
425421
tm.assert_numpy_array_equal(result, expected)
426422

0 commit comments

Comments
 (0)