sync mplexporter submodule (#1409)

* sync mplexporter
* Fix tests for updated mplexporter
* Initialize matplotlib backend once in test_optional __init__.py

Author: jonmmease

Diff for: plotly/matplotlylib/mplexporter/exporter.py

@@ -10,7 +10,7 @@
 
 import matplotlib
 from matplotlib import transforms, collections
-
+from matplotlib.backends.backend_agg import FigureCanvasAgg
 
 class Exporter(object):
     """Matplotlib Exporter
@@ -42,6 +42,8 @@ def run(self, fig):
         """
         # Calling savefig executes the draw() command, putting elements
         # in the correct place.
+        if fig.canvas is None:
+            canvas = FigureCanvasAgg(fig)
         fig.savefig(io.BytesIO(), format='png', dpi=fig.dpi)
         if self.close_mpl:
             import matplotlib.pyplot as plt
@@ -157,13 +159,16 @@ def crawl_legend(self, ax, legend):
             # force a large zorder so it appears on top
             child.set_zorder(1E6 + child.get_zorder())
 
+            # reorder border box to make sure marks are visible
+            if isinstance(child, matplotlib.patches.FancyBboxPatch):
+                child.set_zorder(child.get_zorder()-1)
+
             try:
                 # What kind of object...
                 if isinstance(child, matplotlib.patches.Patch):
                     self.draw_patch(ax, child, force_trans=ax.transAxes)
                 elif isinstance(child, matplotlib.text.Text):
-                    if not (child is legend.get_children()[-1]
-                            and child.get_text() == 'None'):
+                    if child.get_text() != 'None':
                         self.draw_text(ax, child, force_trans=ax.transAxes)
                 elif isinstance(child, matplotlib.lines.Line2D):
                     self.draw_line(ax, child, force_trans=ax.transAxes)
@@ -181,7 +186,8 @@ def draw_line(self, ax, line, force_trans=None):
                                                    ax, line.get_xydata(),
                                                    force_trans=force_trans)
         linestyle = utils.get_line_style(line)
-        if linestyle['dasharray'] in ['None', 'none', None]:
+        if (linestyle['dasharray'] is None
+                and linestyle['drawstyle'] == 'default'):
             linestyle = None
         markerstyle = utils.get_marker_style(line)
         if (markerstyle['marker'] in ['None', 'none', None]

Diff for: plotly/matplotlylib/mplexporter/renderers/base.py

@@ -1,8 +1,10 @@
 import warnings
 import itertools
 from contextlib import contextmanager
+from distutils.version import LooseVersion
 
 import numpy as np
+import matplotlib as mpl
 from matplotlib import transforms
 
 from .. import utils
@@ -189,8 +191,11 @@ def _iter_path_collection(paths, path_transforms, offsets, styles):
         """Build an iterator over the elements of the path collection"""
         N = max(len(paths), len(offsets))
 
-        if not path_transforms:
-            path_transforms = [np.eye(3)]
+        # Before mpl 1.4.0, path_transform can be a false-y value, not a valid
+        # transformation matrix.
+        if LooseVersion(mpl.__version__) < LooseVersion('1.4.0'):
+            if path_transforms is None:
+                path_transforms = [np.eye(3)]
 
         edgecolor = styles['edgecolor']
         if np.size(edgecolor) == 0:
@@ -260,8 +265,8 @@ def draw_path_collection(self, paths, path_coordinates, path_transforms,
             # This is a hack:
             if path_coordinates == "figure":
                 path_coordinates = "points"
-            style = {"edgecolor": utils.color_to_hex(ec),
-                     "facecolor": utils.color_to_hex(fc),
+            style = {"edgecolor": utils.export_color(ec),
+                     "facecolor": utils.export_color(fc),
                      "edgewidth": lw,
                      "dasharray": "10,0",
                      "alpha": styles['alpha'],

Diff for: plotly/matplotlylib/mplexporter/tests/__init__.py

@@ -0,0 +1,3 @@
+import matplotlib
+matplotlib.use('Agg')
+import matplotlib.pyplot as plt

Diff for: plotly/matplotlylib/mplexporter/tests/test_basic.py

@@ -1,13 +1,13 @@
-from ..exporter import Exporter
-from ..renderers import FakeRenderer, FullFakeRenderer
-
 import matplotlib
-matplotlib.use('Agg')
-import matplotlib.pyplot as plt
-
 import numpy as np
+from distutils.version import LooseVersion
+from nose.plugins.skip import SkipTest
 from numpy.testing import assert_warns
 
+from ..exporter import Exporter
+from ..renderers import FakeRenderer, FullFakeRenderer
+from . import plt
+
 
 def fake_renderer_output(fig, Renderer):
     renderer = Renderer()
@@ -128,6 +128,23 @@ def test_path():
                          closing figure
                          """)
 
+def test_Figure():
+    """ if the fig is not associated with a canvas, FakeRenderer shall
+    not fail. """
+    fig = plt.Figure()
+    ax = fig.add_subplot(111)
+    ax.add_patch(plt.Circle((0, 0), 1))
+    ax.add_patch(plt.Rectangle((0, 0), 1, 2))
+
+    _assert_output_equal(fake_renderer_output(fig, FakeRenderer),
+                         """
+                         opening figure
+                         opening axes
+                         draw path with 25 vertices
+                         draw path with 4 vertices
+                         closing axes
+                         closing figure
+                         """)
 
 def test_multiaxes():
     fig, ax = plt.subplots(2)
@@ -148,24 +165,27 @@ def test_multiaxes():
 
 
 def test_image():
+    # Test fails for matplotlib 1.5+ because the size of the image
+    # generated by matplotlib has changed.
+    if LooseVersion(matplotlib.__version__) >= LooseVersion('1.5.0'):
+        raise SkipTest("Test fails for matplotlib version > 1.5.0");
     np.random.seed(0)  # image size depends on the seed
-    fig, ax = plt.subplots()
+    fig, ax = plt.subplots(figsize=(2, 2))
     ax.imshow(np.random.random((10, 10)),
               cmap=plt.cm.jet, interpolation='nearest')
-
     _assert_output_equal(fake_renderer_output(fig, FakeRenderer),
                          """
                          opening figure
                          opening axes
-                         draw image of size 2848
+                         draw image of size 1240 
                          closing axes
                          closing figure
                          """)
 
 
 def test_legend():
     fig, ax = plt.subplots()
-    ax.plot([1,2,3], label='label')
+    ax.plot([1, 2, 3], label='label')
     ax.legend().set_visible(False)
     _assert_output_equal(fake_renderer_output(fig, FakeRenderer),
                          """
@@ -178,10 +198,11 @@ def test_legend():
                          closing figure
                          """)
 
+
 def test_legend_dots():
     fig, ax = plt.subplots()
-    ax.plot([1,2,3], label='label')
-    ax.plot([2,2,2], 'o', label='dots')
+    ax.plot([1, 2, 3], label='label')
+    ax.plot([2, 2, 2], 'o', label='dots')
     ax.legend().set_visible(True)
     _assert_output_equal(fake_renderer_output(fig, FullFakeRenderer),
                          """
@@ -194,14 +215,14 @@ def test_legend_dots():
                          draw text 'label' None
                          draw 2 markers
                          draw text 'dots' None
-                         draw path with 5 vertices
+                         draw path with 4 vertices
                          closing legend
                          closing axes
                          closing figure
                          """)
 
+
 def test_blended():
     fig, ax = plt.subplots()
     ax.axvline(0)
-    assert_warns(UserWarning, fake_renderer_output, fig, FakeRenderer)
-    
+    #assert_warns(UserWarning, fake_renderer_output, fig, FakeRenderer)

Diff for: plotly/matplotlylib/mplexporter/tests/test_utils.py

@@ -1,5 +1,5 @@
 from numpy.testing import assert_allclose, assert_equal
-import matplotlib.pyplot as plt
+from . import plt
 from .. import utils
 
 
@@ -9,3 +9,26 @@ def test_path_data():
 
     assert_allclose(vertices.shape, (25, 2))
     assert_equal(codes, ['M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'Z'])
+
+
+def test_linestyle():
+    linestyles = {'solid': 'none', '-': 'none',
+                  'dashed': '6,6', '--': '6,6',
+                  'dotted': '2,2', ':': '2,2',
+                  'dashdot': '4,4,2,4', '-.': '4,4,2,4',
+                  '': None, 'None': None}
+
+    for ls, result in linestyles.items():
+        line, = plt.plot([1, 2, 3], linestyle=ls)
+        assert_equal(utils.get_dasharray(line), result)
+
+
+def test_axis_w_fixed_formatter():
+    positions, labels = [0, 1, 10], ['A','B','C']
+
+    plt.xticks(positions, labels)
+    props = utils.get_axis_properties(plt.gca().xaxis)
+
+    assert_equal(props['tickvalues'], positions)
+    assert_equal(props['tickformat'], labels)
+