fix up test failures caused through rebase

pizzathief · pizzathief · commit c4a824e4df5c · 2016-01-21T12:09:07.000+11:00
diff --git a/lib/matplotlib/tests/test_animation.py b/lib/matplotlib/tests/test_animation.py
@@ -64,12 +64,12 @@ def animate(i):
     anim.save(filename, fps=fps, dpi=dpi, writer=writer,
               savefig_kwargs=savefig_kwargs)
 
-    assert_equal(writer.fig, fig)
-    assert_equal(writer.outfile, filename)
-    assert_equal(writer.dpi, dpi)
-    assert_equal(writer.args, ())
-    assert_equal(writer.savefig_kwargs, savefig_kwargs)
-    assert_equal(writer._count, num_frames)
+    assert writer.fig == fig
+    assert writer.outfile == filename
+    assert writer.dpi == dpi
+    assert writer.args == ()
+    assert writer.savefig_kwargs == savefig_kwargs
+    assert writer._count == num_frames
 
 
 @animation.writers.register('null')
diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py
@@ -8,15 +8,12 @@
 import itertools
 import matplotlib as mpl
 import matplotlib.lines as mlines
-import nose
-from nose.tools import assert_true, assert_raises
-import pytest
 from timeit import repeat
 import numpy as np
-
 import matplotlib.pyplot as plt
 from matplotlib.testing.decorators import cleanup, image_comparison
 import sys
+import pytest
 
 
 @cleanup
