make offline plot_mpl test more readable and update version

cldougl · cldougl · commit 2b57d3d7992e · 2016-01-17T17:17:25.000-05:00
diff --git a/plotly/offline/offline.py b/plotly/offline/offline.py
@@ -319,7 +319,7 @@ def plot_mpl(mpl_fig, resize=False, strip_style=False,
     Convert a matplotlib figure to a Plotly graph stored locally as HTML.
 
     For more information on converting matplotlib visualizations to plotly
-    graphs, call help(plotly.plot_mpl)
+    graphs, call help(plotly.tools.mpl_to_plotly)
 
     For more information on creating plotly charts locally as an HTML document
     or string, call help(plotly.offline.plot)
@@ -387,7 +387,7 @@ def iplot_mpl(mpl_fig, resize=False, strip_style=False,
     notebook without connecting to an external server.
 
     To save the chart to Plotly Cloud or Plotly Enterprise, use
-    `plotly.tools.mpl_to_plotly`.
+    `plotly.plotly.plot_mpl`.
 
     For more information on converting matplotlib visualizations to plotly
     graphs call `help(plotly.tools.mpl_to_plotly)`
@@ -453,7 +453,7 @@ def enable_mpl_offline(resize=False, strip_style=False,
     import matplotlib.pyplot as plt
 
     init_notebook_mode()
-    plotly_takeover()
+    enable_mpl_offline()
 
     fig = plt.figure()
     x = [10, 15, 20, 25, 30]
diff --git a/plotly/tests/test_optional/test_offline/test_offline.py b/plotly/tests/test_optional/test_offline/test_offline.py
@@ -6,18 +6,20 @@
 
 from nose.tools import raises
 from unittest import TestCase
+import json
 
 import plotly
 
 # TODO: matplotlib-build-wip
 from plotly.tools import _matplotlylib_imported
+
 if _matplotlylib_imported:
     import matplotlib
-
     # Force matplotlib to not use any Xwindows backend.
     matplotlib.use('Agg')
     import matplotlib.pyplot as plt
 
+
 # Generate matplotlib plot for tests
 fig = plt.figure()
 
@@ -59,24 +61,11 @@ def _read_html(self, file_url):
             return f.read()
 
     def test_default_mpl_plot_generates_expected_html(self):
-        data_json = ('[{"name": "_line0", "yaxis": "y1", "marker": {"color":' +
-                     ' "#0000FF", "opacity": 1, "line": {"color": "#000000",' +
-                     ' "width": 0.5}, "symbol": "dot", "size": 6.0}, "mode":' +
-                     ' "markers", "xaxis": "x1", "y": [100.0, 200.0, 300.0],' +
-                     ' "x": [10.0, 20.0, 30.0], "type": "scatter"}]')
-        layout_json = ('{"autosize": false, "width": 640, "showlegend": ' +
-                       'false, "xaxis1": {"tickfont": {"size": 12.0}, ' +
-                       '"domain": [0.0, 1.0], "ticks": "inside", "showgrid":' +
-                       ' false, "range": [10.0, 30.0], "mirror": "ticks", ' +
-                       '"zeroline": false, "showline": true, "nticks": 5, ' +
-                       '"type": "linear", "anchor": "y1", "side": "bottom"},' +
-                       ' "height": 480, "yaxis1": {"tickfont": ' +
-                       '{"size": 12.0}, "domain": [0.0, 1.0], "ticks": ' +
-                       '"inside", "showgrid": false, "range": [100.0, 300.0]' +
-                       ', "mirror": "ticks", "zeroline": false, "showline": ' +
-                       'true, "nticks": 5, "type": "linear", "anchor": "x1",' +
-                       ' "side": "left"}, "hovermode": "closest", "margin":' +
-                       ' {"b": 47, "r": 63, "pad": 0, "t": 47, "l": 80}}')
+        figure = plotly.tools.mpl_to_plotly(fig)
+        data = figure['data']
+        layout = figure['layout']
+        data_json = json.dumps(data, cls=plotly.utils.PlotlyJSONEncoder)
+        layout_json = json.dumps(layout, cls=plotly.utils.PlotlyJSONEncoder)
         html = self._read_html(plotly.offline.plot_mpl(fig))
 
         # just make sure a few of the parts are in here
diff --git a/plotly/version.py b/plotly/version.py
@@ -1 +1 @@
-__version__ = '1.9.4'
+__version__ = '1.9.5'

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = '1.9.4'`
	`1`	`+__version__ = '1.9.5'`