Revert "Clean up imports for test_api"

This reverts commit 99a55df.

Author: h-vetinari

pandas/tests/frame/test_api.py

@@ -14,8 +14,13 @@
 from numpy.random import randn
 import numpy as np
 
-from pandas import (DataFrame, Series, Index, MultiIndex, date_range, NaT,
-                    timedelta_range, Timestamp, Categorical, SparseDataFrame)
+from pandas import (DataFrame, Series, date_range, timedelta_range,
+                    Categorical, SparseDataFrame)
+import pandas as pd
+
+from pandas.util.testing import (assert_almost_equal,
+                                 assert_series_equal,
+                                 assert_frame_equal)
 
 import pandas.util.testing as tm
 
@@ -70,19 +75,19 @@ def test_get_value(self, float_frame):
 
     def test_add_prefix_suffix(self, float_frame):
         with_prefix = float_frame.add_prefix('foo#')
-        expected = Index(['foo#%s' % c for c in float_frame.columns])
+        expected = pd.Index(['foo#%s' % c for c in float_frame.columns])
         tm.assert_index_equal(with_prefix.columns, expected)
 
         with_suffix = float_frame.add_suffix('#foo')
-        expected = Index(['%s#foo' % c for c in float_frame.columns])
+        expected = pd.Index(['%s#foo' % c for c in float_frame.columns])
         tm.assert_index_equal(with_suffix.columns, expected)
 
         with_pct_prefix = float_frame.add_prefix('%')
-        expected = Index(['%{}'.format(c) for c in float_frame.columns])
+        expected = pd.Index(['%{}'.format(c) for c in float_frame.columns])
         tm.assert_index_equal(with_pct_prefix.columns, expected)
 
         with_pct_suffix = float_frame.add_suffix('%')
-        expected = Index(['{}%'.format(c) for c in float_frame.columns])
+        expected = pd.Index(['{}%'.format(c) for c in float_frame.columns])
         tm.assert_index_equal(with_pct_suffix.columns, expected)
 
     def test_get_axis(self, float_frame):
@@ -123,21 +128,21 @@ def test_column_contains_typeerror(self, float_frame):
 
     def test_tab_completion(self):
         # DataFrame whose columns are identifiers shall have them in __dir__.
-        df = DataFrame([list('abcd'), list('efgh')], columns=list('ABCD'))
+        df = pd.DataFrame([list('abcd'), list('efgh')], columns=list('ABCD'))
         for key in list('ABCD'):
             assert key in dir(df)
-        assert isinstance(df.__getitem__('A'), Series)
+        assert isinstance(df.__getitem__('A'), pd.Series)
 
         # DataFrame whose first-level columns are identifiers shall have
         # them in __dir__.
-        df = DataFrame([list('abcd'), list('efgh')],
-                       columns=MultiIndex.from_tuples(list(zip('ABCD',
-                                                               'EFGH'))))
+        df = pd.DataFrame(
+            [list('abcd'), list('efgh')],
+            columns=pd.MultiIndex.from_tuples(list(zip('ABCD', 'EFGH'))))
         for key in list('ABCD'):
             assert key in dir(df)
         for key in list('EFGH'):
             assert key not in dir(df)
-        assert isinstance(df.__getitem__('A'), DataFrame)
+        assert isinstance(df.__getitem__('A'), pd.DataFrame)
 
     def test_not_hashable(self, empty_frame):
         df = self.klass([1])
@@ -309,7 +314,7 @@ def test_values(self, float_frame, float_string_frame):
         # single block corner case
         arr = float_frame[['A', 'B']].values
         expected = float_frame.reindex(columns=['A', 'B']).values
-        tm.assert_almost_equal(arr, expected)
+        assert_almost_equal(arr, expected)
 
     def test_transpose(self, float_frame):
         frame = float_frame
@@ -342,11 +347,11 @@ def test_axis_aliases(self, float_frame):
         # reg name
         expected = f.sum(axis=0)
         result = f.sum(axis='index')
-        tm.assert_series_equal(result, expected)
+        assert_series_equal(result, expected)
 
         expected = f.sum(axis=1)
         result = f.sum(axis='columns')
-        tm.assert_series_equal(result, expected)
+        assert_series_equal(result, expected)
 
     def test_class_axis(self):
         # GH 18147
@@ -360,7 +365,7 @@ def test_more_values(self, float_string_frame):
 
     def test_repr_with_mi_nat(self, float_string_frame):
         df = self.klass({'X': [1, 2]},
-                        index=[[NaT, Timestamp('20130101')], ['a', 'b']])
+                        index=[[pd.NaT, pd.Timestamp('20130101')], ['a', 'b']])
         res = repr(df)
         exp = '              X\nNaT        a  1\n2013-01-01 b  2'
         assert res == exp
@@ -405,8 +410,8 @@ class TestDataFrameMisc(SharedWithSparse):
 
     klass = DataFrame
     # SharedWithSparse tests use generic, klass-agnostic assertion
-    _assert_frame_equal = staticmethod(tm.assert_frame_equal)
-    _assert_series_equal = staticmethod(tm.assert_series_equal)
+    _assert_frame_equal = staticmethod(assert_frame_equal)
+    _assert_series_equal = staticmethod(assert_series_equal)
 
     def test_values(self, float_frame):
         float_frame.values[:, 0] = 5.
@@ -415,8 +420,7 @@ def test_values(self, float_frame):
     def test_as_matrix_deprecated(self, float_frame):
         # GH 18458
         with tm.assert_produces_warning(FutureWarning):
-            cols = float_frame.columns.tolist()
-            result = float_frame.as_matrix(columns=cols)
+            result = float_frame.as_matrix(columns=float_frame.columns.tolist())
         expected = float_frame.values
         tm.assert_numpy_array_equal(result, expected)