Skip to content

Commit 6fa9b68

Browse files
SaturnFromTitanproost
authored andcommitted
Fixed test util imports in pandas/tests/frame - part1 (pandas-dev#29300)
1 parent da22c30 commit 6fa9b68

File tree

6 files changed

+337
-351
lines changed

6 files changed

+337
-351
lines changed

pandas/tests/frame/test_api.py

+5-10
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616
timedelta_range,
1717
)
1818
import pandas.util.testing as tm
19-
from pandas.util.testing import (
20-
assert_almost_equal,
21-
assert_frame_equal,
22-
assert_series_equal,
23-
)
2419

2520

2621
class SharedWithSparse:
@@ -344,7 +339,7 @@ def test_values(self, float_frame, float_string_frame):
344339
# single block corner case
345340
arr = float_frame[["A", "B"]].values
346341
expected = float_frame.reindex(columns=["A", "B"]).values
347-
assert_almost_equal(arr, expected)
342+
tm.assert_almost_equal(arr, expected)
348343

349344
def test_to_numpy(self):
350345
df = pd.DataFrame({"A": [1, 2], "B": [3, 4.5]})
@@ -401,11 +396,11 @@ def test_axis_aliases(self, float_frame):
401396
# reg name
402397
expected = f.sum(axis=0)
403398
result = f.sum(axis="index")
404-
assert_series_equal(result, expected)
399+
tm.assert_series_equal(result, expected)
405400

406401
expected = f.sum(axis=1)
407402
result = f.sum(axis="columns")
408-
assert_series_equal(result, expected)
403+
tm.assert_series_equal(result, expected)
409404

410405
def test_class_axis(self):
411406
# GH 18147
@@ -474,8 +469,8 @@ class TestDataFrameMisc(SharedWithSparse):
474469

475470
klass = DataFrame
476471
# SharedWithSparse tests use generic, klass-agnostic assertion
477-
_assert_frame_equal = staticmethod(assert_frame_equal)
478-
_assert_series_equal = staticmethod(assert_series_equal)
472+
_assert_frame_equal = staticmethod(tm.assert_frame_equal)
473+
_assert_series_equal = staticmethod(tm.assert_series_equal)
479474

480475
def test_values(self, float_frame):
481476
float_frame.values[:, 0] = 5.0

0 commit comments

Comments
 (0)