CLN: Convert assert_(x != y) to assertNotEqual

Work on #6175. Converts instances in pandas/tests and pandas/*/tests. Tests still pass locally.

Author: bwignall

pandas/stats/tests/test_ols.py

@@ -294,7 +294,7 @@ def test_r2_no_intercept(self):
         assert_series_equal(model1.beta, model2.beta)
 
         # TODO: can we infer whether the intercept is there...
-        self.assert_(model1.r2 != model2.r2)
+        self.assertNotEqual(model1.r2, model2.r2)
 
         # rolling
 

pandas/tests/test_format.py

@@ -798,7 +798,7 @@ def test_wide_repr(self):
             assert "10 rows x %d columns" % (max_cols - 1) in rep_str
             set_option('display.expand_frame_repr', True)
             wide_repr = repr(df)
-            self.assert_(rep_str != wide_repr)
+            self.assertNotEqual(rep_str, wide_repr)
 
             with option_context('display.width', 120):
                 wider_repr = repr(df)
@@ -824,7 +824,7 @@ def test_wide_repr_named(self):
             rep_str = repr(df)
             set_option('display.expand_frame_repr', True)
             wide_repr = repr(df)
-            self.assert_(rep_str != wide_repr)
+            self.assertNotEqual(rep_str, wide_repr)
 
             with option_context('display.width', 150):
                 wider_repr = repr(df)
@@ -848,7 +848,7 @@ def test_wide_repr_multiindex(self):
             rep_str = repr(df)
             set_option('display.expand_frame_repr', True)
             wide_repr = repr(df)
-            self.assert_(rep_str != wide_repr)
+            self.assertNotEqual(rep_str, wide_repr)
 
             with option_context('display.width', 150):
                 wider_repr = repr(df)
@@ -874,7 +874,7 @@ def test_wide_repr_multiindex_cols(self):
             rep_str = repr(df)
             set_option('display.expand_frame_repr', True)
             wide_repr = repr(df)
-            self.assert_(rep_str != wide_repr)
+            self.assertNotEqual(rep_str, wide_repr)
 
         with option_context('display.width', 150):
             wider_repr = repr(df)
@@ -891,7 +891,7 @@ def test_wide_repr_unicode(self):
             rep_str = repr(df)
             set_option('display.expand_frame_repr', True)
             wide_repr = repr(df)
-            self.assert_(rep_str != wide_repr)
+            self.assertNotEqual(rep_str, wide_repr)
 
             with option_context('display.width', 150):
                 wider_repr = repr(df)

pandas/tests/test_frame.py

@@ -8835,7 +8835,7 @@ def test_rename_inplace(self):
 
         self.assert_('C' not in frame)
         self.assert_('foo' in frame)
-        self.assert_(id(frame['foo']) != c_id)
+        self.assertNotEqual(id(frame['foo']), c_id)
 
     def test_rename_bug(self):
         # GH 5344
@@ -9577,7 +9577,7 @@ def test_sort_index_inplace(self):
         df.sort_index(inplace=True)
         expected = frame
         assert_frame_equal(df, expected)
-        self.assert_(a_id != id(df['A']))
+        self.assertNotEqual(a_id, id(df['A']))
 
         df = unordered.copy()
         df.sort_index(ascending=False, inplace=True)

pandas/tests/test_panel.py

@@ -1358,7 +1358,7 @@ def test_swapaxes(self):
         # this works, but return a copy
         result = self.panel.swapaxes('items', 'items')
         assert_panel_equal(self.panel,result)
-        self.assert_(id(self.panel) != id(result))
+        self.assertNotEqual(id(self.panel), id(result))
 
     def test_transpose(self):
         result = self.panel.transpose('minor', 'major', 'items')

pandas/tests/test_panel4d.py

@@ -872,7 +872,7 @@ def test_swapaxes(self):
         # this works, but return a copy
         result = self.panel4d.swapaxes('items', 'items')
         assert_panel4d_equal(self.panel4d,result)
-        self.assert_(id(self.panel4d) != id(result))
+        self.assertNotEqual(id(self.panel4d), id(result))
 
     def test_to_frame(self):
         raise nose.SkipTest("skipping for now")

pandas/tseries/tests/test_offsets.py

@@ -150,7 +150,6 @@ def test_eq(self):
         offset1 = DateOffset(days=1)
         offset2 = DateOffset(days=365)
 
-        self.assert_(offset1 != offset2)
         self.assertNotEqual(offset1, offset2)
 
 

pandas/tseries/tests/test_period.py

@@ -199,7 +199,7 @@ def test_period_constructor(self):
 
     def test_freq_str(self):
         i1 = Period('1982', freq='Min')
-        self.assert_(i1.freq[0] != '1')
+        self.assertNotEqual(i1.freq[0], '1')
 
     def test_repr(self):
         p = Period('Jan-2000')

pandas/tseries/tests/test_timeseries.py

@@ -1729,9 +1729,9 @@ def test_timestamp_compare_with_early_datetime(self):
         self.assertFalse(stamp == datetime.min)
         self.assertFalse(stamp == datetime(1600, 1, 1))
         self.assertFalse(stamp == datetime(2700, 1, 1))
-        self.assert_(stamp != datetime.min)
-        self.assert_(stamp != datetime(1600, 1, 1))
-        self.assert_(stamp != datetime(2700, 1, 1))
+        self.assertNotEqual(stamp, datetime.min)
+        self.assertNotEqual(stamp, datetime(1600, 1, 1))
+        self.assertNotEqual(stamp, datetime(2700, 1, 1))
         self.assert_(stamp > datetime(1600, 1, 1))
         self.assert_(stamp >= datetime(1600, 1, 1))
         self.assert_(stamp < datetime(2700, 1, 1))
@@ -2593,28 +2593,28 @@ def test_comparison(self):
         val = Timestamp(stamp)
 
         self.assertEqual(val, val)
-        self.assert_(not val != val)
-        self.assert_(not val < val)
+        self.assertFalse(val != val)
+        self.assertFalse(val < val)
         self.assert_(val <= val)
-        self.assert_(not val > val)
+        self.assertFalse(val > val)
         self.assert_(val >= val)
 
         other = datetime(2012, 5, 18)
         self.assertEqual(val, other)
-        self.assert_(not val != other)
-        self.assert_(not val < other)
-        self.assert_(val <= other)
-        self.assert_(not val > other)
-        self.assert_(val >= other)
+        self.assertFalse(val != other)
+        self.assertFalse(val < other)
+        self.assertTrue(val <= other)
+        self.assertFalse(val > other)
+        self.assertTrue(val >= other)
 
         other = Timestamp(stamp + 100)
 
         self.assertNotEqual(val, other)
-        self.assert_(val != other)
-        self.assert_(val < other)
-        self.assert_(val <= other)
-        self.assert_(other > val)
-        self.assert_(other >= val)
+        self.assertNotEqual(val, other)
+        self.assertTrue(val < other)
+        self.assertTrue(val <= other)
+        self.assertTrue(other > val)
+        self.assertTrue(other >= val)
 
     def test_cant_compare_tz_naive_w_aware(self):
         _skip_if_no_pytz()