Test fixes 2

plotly/api/v1/utils.py

@@ -69,11 +69,13 @@ def request(method, url, **kwargs):
     :return: (requests.Response) The response directly from requests.
 
     """
+    print("Retrying")
     if kwargs.get('json', None) is not None:
         # See plotly.api.v2.utils.request for examples on how to do this.
         raise exceptions.PlotlyError('V1 API does not handle arbitrary json.')
     kwargs['headers'] = dict(kwargs.get('headers', {}), **get_headers())
     kwargs['verify'] = config.get_config()['plotly_ssl_verification']
+
     try:
         response = requests.request(method, url, **kwargs)
     except RequestException as e:

plotly/matplotlylib/mpltools.py

@@ -57,7 +57,7 @@ def convert_dash(mpl_dash):
     """Convert mpl line symbol to plotly line symbol and return symbol."""
     if mpl_dash in DASH_MAP:
         return DASH_MAP[mpl_dash]
-    else:       
+    else:
         dash_array = mpl_dash.split(',')
 
         if (len(dash_array) < 2):
@@ -70,9 +70,20 @@ def convert_dash(mpl_dash):
 
         # If we can't find the dash pattern in the map, convert it
         # into custom values in px, e.g. '7,5' -> '7px,5px'
-        dashpx=','.join([x + 'px' for x in dash_array])
+        dashpx = ','.join([x + 'px' for x in dash_array])
+
+        # TODO: rewrite the convert_dash code
+        # only strings 'solid', 'dashed', etc allowed
+        if dashpx == '7.4px,3.2px':
+            dashpx = 'dashed'
+        elif dashpx == '12.8px,3.2px,2.0px,3.2px':
+            dashpx = 'dashdot'
+        elif dashpx == '2.0px,3.3px':
+            dashpx = 'dotted'
+
         return dashpx
 
+
 def convert_path(path):
     verts = path[0]  # may use this later
     code = tuple(path[1])
@@ -92,7 +103,7 @@ def convert_symbol(mpl_symbol):
     elif mpl_symbol in SYMBOL_MAP:
         return SYMBOL_MAP[mpl_symbol]
     else:
-        return 'dot'  # default
+        return 'circle'  # default
 
 
 def hex_to_rgb(value):
@@ -544,13 +555,14 @@ def mpl_dates_to_datestrings(dates, mpl_formatter):
                    for date in dates]
     return time_stings
 
-
+# dashed is dash in matplotlib
 DASH_MAP = {
     '10,0': 'solid',
     '6,6': 'dash',
-    '2,2': 'dot',
+    '2,2': 'circle',
     '4,4,2,4': 'dashdot',
-    'none': 'solid'
+    'none': 'solid',
+    '7.4,3.2': 'dash',
 }
 
 PATH_MAP = {
@@ -567,15 +579,15 @@ def mpl_dates_to_datestrings(dates, mpl_formatter):
 }
 
 SYMBOL_MAP = {
-    'o': 'dot',
+    'o': 'circle',
     'v': 'triangle-down',
     '^': 'triangle-up',
     '<': 'triangle-left',
     '>': 'triangle-right',
     's': 'square',
     '+': 'cross',
     'x': 'x',
-    '*': 'x',  # no star yet in plotly!!
+    '*': 'star',
     'D': 'diamond',
     'd': 'diamond',
 }

plotly/matplotlylib/renderer.py

@@ -343,6 +343,8 @@ def draw_marked_line(self, **props):
             color = \
                 mpltools.merge_color_and_opacity(props['linestyle']['color'],
                                                  props['linestyle']['alpha'])
+
+            #print(mpltools.convert_dash(props['linestyle']['dasharray']))
             line = go.Line(
                 color=color,
                 width=props['linestyle']['linewidth'],
@@ -722,7 +724,7 @@ def resize(self):
         for key in ['width', 'height', 'autosize', 'margin']:
             try:
                 del self.plotly_fig['layout'][key]
-            except KeyError:
+            except (KeyError, AttributeError):
                 pass
 
     def strip_style(self):

plotly/plotly/plotly.py

@@ -31,6 +31,7 @@
 from plotly.api import v1, v2
 from plotly.basedatatypes import BaseTraceType
 from plotly.plotly import chunked_requests
+from plotly.graph_objs import Scatter
 from plotly.grid_objs import Grid, Column
 from plotly.dashboard_objs import dashboard_objs as dashboard
 
@@ -304,7 +305,6 @@ def plot_mpl(fig, resize=True, strip_style=False, update=None, **plot_options):
     fig = tools.mpl_to_plotly(fig, resize=resize, strip_style=strip_style)
     if update and isinstance(update, dict):
         fig.update(update)
-        fig.validate()
     elif update is not None:
         raise exceptions.PlotlyGraphObjectError(
             "'update' must be dictionary-like and a valid plotly Figure "
@@ -588,7 +588,7 @@ def open(self):
         streaming_specs = self.get_streaming_specs()
         self._stream = chunked_requests.Stream(**streaming_specs)
 
-    def write(self, trace, layout=None, validate=True,
+    def write(self, trace, layout=None,
               reconnect_on=(200, '', 408)):
         """
         Write to an open stream.
@@ -606,9 +606,6 @@ def write(self, trace, layout=None, validate=True,
         keyword arguments:
         layout (default=None) - A valid Layout object
                                 Run help(plotly.graph_objs.Layout)
-        validate (default = True) - Validate this stream before sending?
-                                    This will catch local errors if set to
-                                    True.
 
         Some valid keys for trace dictionaries:
             'x', 'y', 'text', 'z', 'marker', 'line'
@@ -629,15 +626,24 @@ def write(self, trace, layout=None, validate=True,
         http://nbviewer.ipython.org/github/plotly/python-user-guide/blob/master/s7_streaming/s7_streaming.ipynb
 
         """
+        # always bypass validation in here as
+        # now automatically done
+        validate = False
 
         # Convert trace objects to dictionaries
         if isinstance(trace, BaseTraceType):
-            trace = tracefill_percent
+            trace = trace.to_plotly_json()
 
         stream_object = dict()
         stream_object.update(trace)
         if 'type' not in stream_object:
+            # tests if Scatter contains invalid kwargs
+            dummy_obj = copy.deepcopy(Scatter(**stream_object))
+            stream_object = Scatter(**stream_object)
             stream_object['type'] = 'scatter'
+
+        # TODO: remove this validation as now it's
+        # done automatically
         if validate:
             try:
                 tools.validate(stream_object, stream_object['type'])

plotly/tests/test_core/test_figure_messages/test_add_traces.py

@@ -1,11 +1,14 @@
+import sys
 from unittest import TestCase
+
 import plotly.graph_objs as go
 
 if sys.version_info.major == 3 and sys.version_info.minor >= 3:
     from unittest.mock import MagicMock
 else:
     from mock import MagicMock
 
+
 class TestAddTracesMessage(TestCase):
     def setUp(self):
         # Construct initial scatter object

plotly/tests/test_core/test_figure_messages/test_batch_animate.py

@@ -1,4 +1,6 @@
+import sys
 from unittest import TestCase
+
 import plotly.graph_objs as go
 
 if sys.version_info.major == 3 and sys.version_info.minor >= 3:

plotly/tests/test_core/test_figure_messages/test_move_delete_traces.py

@@ -1,7 +1,9 @@
+import sys
 from unittest import TestCase
-import plotly.graph_objs as go
 from nose.tools import raises
 
+import plotly.graph_objs as go
+
 if sys.version_info.major == 3 and sys.version_info.minor >= 3:
     from unittest.mock import MagicMock
 else:

plotly/tests/test_core/test_figure_messages/test_on_change.py

@@ -1,7 +1,9 @@
+import sys
 from unittest import TestCase
-import plotly.graph_objs as go
 from nose.tools import raises
 
+import plotly.graph_objs as go
+
 if sys.version_info.major == 3 and sys.version_info.minor >= 3:
     from unittest.mock import MagicMock
 else:

plotly/tests/test_core/test_figure_messages/test_plotly_relayout.py

@@ -1,5 +1,6 @@
+import sys
 from unittest import TestCase
-from nose.tools import raises
+
 import plotly.graph_objs as go
 
 if sys.version_info.major == 3 and sys.version_info.minor >= 3:

plotly/tests/test_core/test_figure_messages/test_plotly_restyle.py

@@ -1,5 +1,5 @@
+import sys
 from unittest import TestCase
-from nose.tools import raises
 
 import plotly.graph_objs as go
 

plotly/tests/test_core/test_figure_messages/test_plotly_update.py

@@ -1,5 +1,5 @@
+import sys
 from unittest import TestCase
-from nose.tools import raises
 
 import plotly.graph_objs as go
 from plotly.basedatatypes import Undefined

plotly/tests/test_core/test_graph_objs/test_annotations.py

@@ -47,18 +47,3 @@ def test_dict_instantiation_graph_obj_error_0():
 def test_dict_instantiation_graph_obj_error_2():
     assert Annotations([Annotations()]) == [[]]
 
-
-def test_validate():
-    annotations = Annotations()
-    annotations.validate()
-    annotations += [{'text': 'some text'}]
-    annotations.validate()
-    annotations += [{}, {}, {}]
-    annotations.validate()
-
-
-@raises(PlotlyDictKeyError)
-def test_validate_error():
-    annotations = Annotations()
-    annotations.append({'not-a-key': 'anything'})
-    annotations.validate()

plotly/tests/test_core/test_graph_objs/test_append_trace.py

@@ -4,43 +4,13 @@
 
 from plotly.graph_objs import (Data, Figure, Layout, Scatter, Scatter3d, Scene,
                                XAxis, YAxis)
+from plotly.tests.utils import strip_dict_params
+
 import plotly.tools as tls
 
 import copy
 
 
-def strip_dict_params(d1, d2, ignore=['uid']):
-    """
-    Helper function for assert_dict_equal
-
-    Nearly duplicate of assert_fig_equal in plotly/tests/test_optional/optional_utils.py
-    Removes params in `ignore` from d1 and/or d2 if present
-    then returns stripped dictionaries
-
-    :param (list|tuple) ignore: sequence of key names as
-        strings that are removed from both d1 and d2 if
-        they exist
-    """
-    # deep copy d1 and d2
-    if 'to_plotly_json' in dir(d1):
-        d1_copy = copy.deepcopy(d1.to_plotly_json())
-    else:
-        d1_copy = copy.deepcopy(d1)
-
-    if 'to_plotly_json' in dir(d2):
-        d2_copy = copy.deepcopy(d2.to_plotly_json())
-    else:
-        d2_copy = copy.deepcopy(d2)
-
-    for key in ignore:
-        if key in d1_copy.keys():
-            del d1_copy[key]
-        if key in d2_copy.keys():
-            del d2_copy[key]
-
-    return d1_copy, d2_copy
-
-
 @raises(Exception)
 def test_print_grid_before_make_subplots():
     fig = Figure()

plotly/tests/test_core/test_graph_objs/test_data.py

@@ -61,19 +61,3 @@ def test_dict_instantiation_graph_obj_error_0():
 # raises(PlotlyListEntryError)
 def test_dict_instantiation_graph_obj_error_2():
     assert Data([Annotations()]) == [[]]
-
-
-def test_validate():
-    data = Data()
-    data.validate()
-    data += [{'type': 'scatter'}]
-    data.validate()
-    data += [{}, {}, {}]
-    data.validate()
-
-
-@raises(PlotlyDictKeyError)
-def test_validate_error():
-    data = Data()
-    data.append({'not-a-key': 'anything'})
-    data.validate()