Merge branch 'v1.5.x' into v2.0.x

mdboom · mdboom · commit a6f881a96ccb · 2015-12-14T08:21:46.000-05:00
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -281,7 +281,7 @@ def _from_ordinalf(x, tz=None):
     elif dt.microsecond > 999990:
         dt += datetime.timedelta(microseconds=1e6 - dt.microsecond)
 
-    return dt
+    return dt.astimezone(tz)
 
 
 # a version of _from_ordinalf that can operate on numpy arrays
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
@@ -387,7 +387,11 @@ def _fnt_def(self, k, c, s, d, a, l, n):
         fontname = n[-l:].decode('ascii')
         tfm = _tfmfile(fontname)
         if tfm is None:
-            raise FileNotFoundError("missing font metrics file: %s" % fontname)
+            if six.PY2:
+                error_class = OSError
+            else:
+                error_class = FileNotFoundError
+            raise error_class("missing font metrics file: %s" % fontname)
         if c != 0 and tfm.checksum != 0 and c != tfm.checksum:
             raise ValueError('tfm checksum mismatch: %s'%n)
 
diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
@@ -26,8 +26,8 @@ def test_colorcycle_basic():
     ax.legend(loc='upper left')
 
 
-@image_comparison(baseline_images=['marker_cycle'], remove_text=True,
-                  extensions=['png'])
+@image_comparison(baseline_images=['marker_cycle', 'marker_cycle'],
+                  remove_text=True, extensions=['png'])
 def test_marker_cycle():
     fig = plt.figure()
     ax = fig.add_subplot(111)
@@ -44,11 +44,6 @@ def test_marker_cycle():
     ax.plot(xs, ys, label='red2 dot', lw=4, ms=16)
     ax.legend(loc='upper left')
 
-
-# Reuse the image from test_marker_cycle()
-@image_comparison(baseline_images=['marker_cycle'], remove_text=True,
-                  extensions=['png'])
-def test_marker_cycle_keywords():
     fig = plt.figure()
     ax = fig.add_subplot(111)
     # Test keyword arguments, numpy arrays, and generic iterators
diff --git a/tools/test_triage.py b/tools/test_triage.py
@@ -24,6 +24,8 @@
     R:          Reject test.  Copy the expected result to the source tree.
 """
 
+from __future__ import unicode_literals
+
 import os
 import shutil
 import sys
