Merge pull request #2838 from tacaswell/fix32

tacaswell · tacaswell · commit 01ee2543ad34 · 2014-02-24T23:35:07.000-05:00
TST : make 3.2 pass again
diff --git a/lib/matplotlib/tests/test_animation.py b/lib/matplotlib/tests/test_animation.py
@@ -4,7 +4,7 @@
 import six
 
 import tempfile
-
+import sys
 import numpy as np
 from nose import with_setup
 from matplotlib import pyplot as plt
@@ -35,6 +35,11 @@ def check_save_animation(writer, extension='mp4'):
                                % writer)
     if 'mencoder' in writer:
         raise KnownFailureTest("mencoder is broken")
+
+    ver = sys.version_info
+    if ver[0] == 3 and ver[1] == 2:
+        raise KnownFailureTest("animation saving broken on 3.2")
+
     fig, ax = plt.subplots()
     line, = ax.plot([], [])
 
diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
@@ -166,7 +166,7 @@ def __call__(self, legend, orig_handle, fontsize, handlebox):
             plt.legend([None], ['My first handler'],
                        handler_map={None: AnyObjectHandler()})
 
-        warn.assert_called_with(u'Legend handers must now implement a '
+        warn.assert_called_with('Legend handers must now implement a '
                                 '"legend_artist" method rather than '
                                 'being a callable.',
                                 MatplotlibDeprecationWarning,
