|
14 | 14 | date_range, isnull)
|
15 | 15 | import pandas as pd
|
16 | 16 |
|
17 |
| -from pandas.util.testing import (assert_series_equal, |
18 |
| - assert_frame_equal, |
19 |
| - assertRaisesRegexp) |
| 17 | +from pandas.util.testing import assert_frame_equal |
20 | 18 |
|
21 | 19 | from pandas.errors import PerformanceWarning
|
22 | 20 | import pandas.util.testing as tm
|
@@ -287,15 +285,15 @@ def test_reindex_like(self):
|
287 | 285 | assert_frame_equal(other, self.frame.reindex_like(other))
|
288 | 286 |
|
289 | 287 | def test_reindex_columns(self):
|
290 |
| - newFrame = self.frame.reindex(columns=['A', 'B', 'E']) |
| 288 | + new_frame = self.frame.reindex(columns=['A', 'B', 'E']) |
291 | 289 |
|
292 |
| - assert_series_equal(newFrame['B'], self.frame['B']) |
293 |
| - self.assertTrue(np.isnan(newFrame['E']).all()) |
294 |
| - self.assertNotIn('C', newFrame) |
| 290 | + tm.assert_series_equal(new_frame['B'], self.frame['B']) |
| 291 | + assert np.isnan(new_frame['E']).all() |
| 292 | + assert 'C' not in new_frame |
295 | 293 |
|
296 |
| - # length zero |
297 |
| - newFrame = self.frame.reindex(columns=[]) |
298 |
| - self.assertTrue(newFrame.empty) |
| 294 | + # Length zero |
| 295 | + new_frame = self.frame.reindex(columns=[]) |
| 296 | + assert new_frame.empty |
299 | 297 |
|
300 | 298 | def test_reindex_columns_method(self):
|
301 | 299 |
|
@@ -659,75 +657,75 @@ def test_align_series_combinations(self):
|
659 | 657 | tm.assert_frame_equal(res2, exp1)
|
660 | 658 |
|
661 | 659 | def test_filter(self):
|
662 |
| - # items |
| 660 | + # Items |
663 | 661 | filtered = self.frame.filter(['A', 'B', 'E'])
|
664 |
| - self.assertEqual(len(filtered.columns), 2) |
665 |
| - self.assertNotIn('E', filtered) |
| 662 | + assert len(filtered.columns) == 2 |
| 663 | + assert 'E' not in filtered |
666 | 664 |
|
667 | 665 | filtered = self.frame.filter(['A', 'B', 'E'], axis='columns')
|
668 |
| - self.assertEqual(len(filtered.columns), 2) |
669 |
| - self.assertNotIn('E', filtered) |
| 666 | + assert len(filtered.columns) == 2 |
| 667 | + assert 'E' not in filtered |
670 | 668 |
|
671 |
| - # other axis |
| 669 | + # Other axis |
672 | 670 | idx = self.frame.index[0:4]
|
673 | 671 | filtered = self.frame.filter(idx, axis='index')
|
674 | 672 | expected = self.frame.reindex(index=idx)
|
675 |
| - assert_frame_equal(filtered, expected) |
| 673 | + tm.assert_frame_equal(filtered, expected) |
676 | 674 |
|
677 | 675 | # like
|
678 | 676 | fcopy = self.frame.copy()
|
679 | 677 | fcopy['AA'] = 1
|
680 | 678 |
|
681 | 679 | filtered = fcopy.filter(like='A')
|
682 |
| - self.assertEqual(len(filtered.columns), 2) |
683 |
| - self.assertIn('AA', filtered) |
| 680 | + assert len(filtered.columns) == 2 |
| 681 | + assert 'AA' in filtered |
684 | 682 |
|
685 | 683 | # like with ints in column names
|
686 | 684 | df = DataFrame(0., index=[0, 1, 2], columns=[0, 1, '_A', '_B'])
|
687 | 685 | filtered = df.filter(like='_')
|
688 |
| - self.assertEqual(len(filtered.columns), 2) |
| 686 | + assert len(filtered.columns) == 2 |
689 | 687 |
|
690 | 688 | # regex with ints in column names
|
691 | 689 | # from PR #10384
|
692 | 690 | df = DataFrame(0., index=[0, 1, 2], columns=['A1', 1, 'B', 2, 'C'])
|
693 | 691 | expected = DataFrame(
|
694 | 692 | 0., index=[0, 1, 2], columns=pd.Index([1, 2], dtype=object))
|
695 | 693 | filtered = df.filter(regex='^[0-9]+$')
|
696 |
| - assert_frame_equal(filtered, expected) |
| 694 | + tm.assert_frame_equal(filtered, expected) |
697 | 695 |
|
698 | 696 | expected = DataFrame(0., index=[0, 1, 2], columns=[0, '0', 1, '1'])
|
699 | 697 | # shouldn't remove anything
|
700 | 698 | filtered = expected.filter(regex='^[0-9]+$')
|
701 |
| - assert_frame_equal(filtered, expected) |
| 699 | + tm.assert_frame_equal(filtered, expected) |
702 | 700 |
|
703 | 701 | # pass in None
|
704 |
| - with assertRaisesRegexp(TypeError, 'Must pass'): |
| 702 | + with tm.assertRaisesRegexp(TypeError, 'Must pass'): |
705 | 703 | self.frame.filter()
|
706 |
| - with assertRaisesRegexp(TypeError, 'Must pass'): |
| 704 | + with tm.assertRaisesRegexp(TypeError, 'Must pass'): |
707 | 705 | self.frame.filter(items=None)
|
708 |
| - with assertRaisesRegexp(TypeError, 'Must pass'): |
| 706 | + with tm.assertRaisesRegexp(TypeError, 'Must pass'): |
709 | 707 | self.frame.filter(axis=1)
|
710 | 708 |
|
711 | 709 | # test mutually exclusive arguments
|
712 |
| - with assertRaisesRegexp(TypeError, 'mutually exclusive'): |
| 710 | + with tm.assertRaisesRegexp(TypeError, 'mutually exclusive'): |
713 | 711 | self.frame.filter(items=['one', 'three'], regex='e$', like='bbi')
|
714 |
| - with assertRaisesRegexp(TypeError, 'mutually exclusive'): |
| 712 | + with tm.assertRaisesRegexp(TypeError, 'mutually exclusive'): |
715 | 713 | self.frame.filter(items=['one', 'three'], regex='e$', axis=1)
|
716 |
| - with assertRaisesRegexp(TypeError, 'mutually exclusive'): |
| 714 | + with tm.assertRaisesRegexp(TypeError, 'mutually exclusive'): |
717 | 715 | self.frame.filter(items=['one', 'three'], regex='e$')
|
718 |
| - with assertRaisesRegexp(TypeError, 'mutually exclusive'): |
| 716 | + with tm.assertRaisesRegexp(TypeError, 'mutually exclusive'): |
719 | 717 | self.frame.filter(items=['one', 'three'], like='bbi', axis=0)
|
720 |
| - with assertRaisesRegexp(TypeError, 'mutually exclusive'): |
| 718 | + with tm.assertRaisesRegexp(TypeError, 'mutually exclusive'): |
721 | 719 | self.frame.filter(items=['one', 'three'], like='bbi')
|
722 | 720 |
|
723 | 721 | # objects
|
724 | 722 | filtered = self.mixed_frame.filter(like='foo')
|
725 |
| - self.assertIn('foo', filtered) |
| 723 | + assert 'foo' in filtered |
726 | 724 |
|
727 | 725 | # unicode columns, won't ascii-encode
|
728 | 726 | df = self.frame.rename(columns={'B': u('\u2202')})
|
729 | 727 | filtered = df.filter(like='C')
|
730 |
| - self.assertTrue('C' in filtered) |
| 728 | + assert 'C' in filtered |
731 | 729 |
|
732 | 730 | def test_filter_regex_search(self):
|
733 | 731 | fcopy = self.frame.copy()
|
@@ -857,10 +855,10 @@ def test_reindex_boolean(self):
|
857 | 855 |
|
858 | 856 | def test_reindex_objects(self):
|
859 | 857 | reindexed = self.mixed_frame.reindex(columns=['foo', 'A', 'B'])
|
860 |
| - self.assertIn('foo', reindexed) |
| 858 | + assert 'foo' in reindexed |
861 | 859 |
|
862 | 860 | reindexed = self.mixed_frame.reindex(columns=['A', 'B'])
|
863 |
| - self.assertNotIn('foo', reindexed) |
| 861 | + assert 'foo' not in reindexed |
864 | 862 |
|
865 | 863 | def test_reindex_corner(self):
|
866 | 864 | index = Index(['a', 'b', 'c'])
|
|
0 commit comments