fix errors highlighted in travis CI logs

pizzathief · pizzathief · commit df4e413d2116 · 2016-01-21T12:09:02.000+11:00
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -25,6 +25,7 @@
 from numpy.testing import assert_array_equal
 import warnings
 from matplotlib.cbook import IgnoredKeywordWarning
+import pytest
 
 # Note: Some test cases are run twice: once normally and once with labeled data
 #       These two must be defined in the same test function or need to have
@@ -120,22 +121,22 @@ def test_twinx_cla():
     ax2 = ax.twinx()
     ax3 = ax2.twiny()
     plt.draw()
-    assert ax2.xaxis.get_visible() == False
-    assert x2.patch.get_visible() == False
+    assert not ax2.xaxis.get_visible()
+    assert not x2.patch.get_visible()
     ax2.cla()
     ax3.cla()
 
-    assert ax2.xaxis.get_visible()  == False
-    assert ax2.patch.get_visible() == False
-    assert ax2.yaxis.get_visible() == True
+    assert not ax2.xaxis.get_visible()
+    assert not ax2.patch.get_visible()
+    assert ax2.yaxis.get_visible()
 
-    assert ax3.xaxis.get_visible() == True
-    assert ax3.patch.get_visible() == False
-    assert ax3.yaxis.get_visible() == False
+    assert ax3.xaxis.get_visible()
+    assert not ax3.patch.get_visible()
+    assert not ax3.yaxis.get_visible()
 
-    assert ax.xaxis.get_visible() == True
-    assert ax.patch.get_visible() == True
-    assert ax.yaxis.get_visible() == True
+    assert ax.xaxis.get_visible()
+    assert ax.patch.get_visible()
+    assert ax.yaxis.get_visible()
 
 
 @image_comparison(baseline_images=["minorticks_on_rcParams_both"], extensions=['png'])
diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
@@ -266,7 +266,7 @@ def test__EventCollection__set_orientation():
     new_orientation = 'vertical'
     coll.set_orientation(new_orientation)
     assert new_orientation == coll.get_orientation()
-    assert_ not coll.is_horizontal()
+    assert not coll.is_horizontal()
     check_segments(coll,
                    props['positions'],
                    props['linelength'],
diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py
@@ -197,8 +197,7 @@ def test_strftime_fields(dt):
             locale_formatter = mdates.DateFormatter("%x")
             locale_d_fmt = locale.nl_langinfo(locale.D_FMT)
             expanded_formatter = mdates.DateFormatter(locale_d_fmt)
-            assert locale_formatter.strftime(dt) ==
-                         expanded_formatter.strftime(dt)
+            assert locale_formatter.strftime(dt) == expanded_formatter.strftime(dt)
         except (ImportError, AttributeError):
             pass
 
diff --git a/lib/matplotlib/tests/test_font_manager.py b/lib/matplotlib/tests/test_font_manager.py
@@ -46,5 +46,5 @@ def test_json_serialization():
                      {'family': 'Bitstream Vera Sans', 'weight': 700},
                      {'family': 'no such font family'}):
             fp = FontProperties(**prop)
-            assertfontManager.findfont(fp, rebuild_if_missing=False) ==
+            assert fontManager.findfont(fp, rebuild_if_missing=False) ==
                          copy.findfont(fp, rebuild_if_missing=False)
diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py
@@ -101,8 +101,7 @@ def test_PathEffect_points_to_pixels():
 
     # Confirm that using a path effects renderer maintains point sizes
     # appropriately. Otherwise rendered font would be the wrong size.
-    assert renderer.points_to_pixels(15) ==
-                 pe_renderer.points_to_pixels(15)
+    assert renderer.points_to_pixels(15) == pe_renderer.points_to_pixels(15)
 
 
 def test_SimplePatchShadow_offset():
diff --git a/lib/matplotlib/tests/test_simplification.py b/lib/matplotlib/tests/test_simplification.py
@@ -161,7 +161,7 @@ def test_start_with_moveto():
     assert segs[0][1] == Path.MOVETO
 
 @cleanup
-@raises(OverflowError)
+@pytest.mark.xfail(raises=OverflowError)
 def test_throw_rendering_complexity_exceeded():
     rcParams['path.simplify'] = False
     xx = np.arange(200000)
