matplotlib 2.2.2 - convert unicode to btyte str for matplotlib renderer

Kully · Kully · commit e9b3f57bd1ff · 2018-05-25T08:56:17.000-04:00
diff --git a/_plotly_utils/basevalidators.py b/_plotly_utils/basevalidators.py
@@ -349,7 +349,7 @@ def __init__(self,
         # ----------------------------
         # Look for regular expressions
         for v in self.values:
-            if v and isinstance(v, six.string_types) and v[0] == '/' and v[-1] == '/':
+            if v and isinstance(v, str) and v[0] == '/' and v[-1] == '/':
                 # String is a regex with leading and trailing '/' character
                 regex_str = v[1:-1]
                 self.val_regexs.append(re.compile(regex_str))
@@ -387,7 +387,7 @@ def perform_replacemenet(self, v):
         """
         Return v with any applicable regex replacements applied
         """
-        if isinstance(v, six.string_types):
+        if isinstance(v, str):
             for repl_args in self.regex_replacements:
                 if repl_args:
                     v = re.sub(repl_args[0], repl_args[1], v)
@@ -442,7 +442,7 @@ def in_values(self, e):
         """
         Return whether a value matches one of the enumeration options
         """
-        is_str = isinstance(e, six.string_types)
+        is_str = isinstance(e, str)
         for v, regex in zip(self.values, self.val_regexs):
             if is_str and regex:
                 in_values = fullmatch(regex, e) is not None
@@ -821,7 +821,7 @@ def validate_coerce(self, v):
 
             # If strict, make sure all elements are strings.
             if self.strict:
-                invalid_els = [e for e in v if not isinstance(e, six.string_types)]
+                invalid_els = [e for e in v if not isinstance(e, str)]
                 if invalid_els:
                     self.raise_invalid_elements(invalid_els)
 
@@ -862,10 +862,10 @@ def validate_coerce(self, v):
 
         else:
             if self.strict:
-                if not isinstance(v, six.string_types):
+                if not isinstance(v, str):
                     self.raise_invalid_val(v)
             else:
-                if not isinstance(v, (six.string_types, int, float)):
+                if not isinstance(v, (str, int, float)):
                     self.raise_invalid_val(v)
 
                 # Convert value to a string
@@ -1061,7 +1061,7 @@ def perform_validate_coerce(v, allow_number=None):
         if isinstance(v, numbers.Number) and allow_number:
             # If allow_numbers then any number is ok
             return v
-        elif not isinstance(v, six.string_types):
+        elif not isinstance(v, str):
             # If not allow_numbers then value must be a string
             return None
         else:
@@ -1183,7 +1183,7 @@ def validate_coerce(self, v):
             pass
         if v is None:
             v_valid = True
-        elif isinstance(v, six.string_types):
+        elif isinstance(v, str):
             v_match = [
                 el for el in ColorscaleValidator.named_colorscales
                 if el.lower() == v.lower()
@@ -1198,7 +1198,7 @@ def validate_coerce(self, v):
                     len(e) != 2 or
                     not isinstance(e[0], numbers.Number) or
                     not (0 <= e[0] <= 1) or
-                    not isinstance(e[1], six.string_types) or
+                    not isinstance(e[1], str) or
                     ColorValidator.perform_validate_coerce(e[1]) is None)]
 
             if len(invalid_els) == 0:
@@ -1294,7 +1294,7 @@ def description(self):
     def validate_coerce(self, v):
         if v is None:
             pass
-        elif not isinstance(v, six.string_types):
+        elif not isinstance(v, str):
             self.raise_invalid_val(v)
         else:
             # match = re.fullmatch(self.regex, v)
@@ -1376,7 +1376,7 @@ def description(self):
         return desc
 
     def vc_scalar(self, v):
-        if not isinstance(v, six.string_types):
+        if not isinstance(v, str):
             return None
 
         # To be generous we accept flags separated on plus ('+'),
@@ -1617,7 +1617,7 @@ def description(self):
     def validate_coerce(self, v):
         if v is None:
             pass
-        elif isinstance(v, six.string_types):
+        elif isinstance(v, str):
             # Future possibilities:
             #   - Detect filesystem system paths and convert to URI
             #   - Validate either url or data uri
diff --git a/optional-requirements.txt b/optional-requirements.txt
@@ -8,8 +8,8 @@
 ## numpy (technically, this is covered by matplotlib's deps) ##
 numpy
 
-## matplotlylib dependencies ##
-# matplotlib==1.3.1
+## matplotlylib dependencies - moving away from 1.3.1 ##
+# matplotlib==2.2.2
 
 ## testing dependencies ##
 coverage==4.3.1
diff --git a/plotly/matplotlylib/renderer.py b/plotly/matplotlylib/renderer.py
@@ -8,6 +8,7 @@
 """
 from __future__ import absolute_import
 
+import six
 import warnings
 
 import plotly.graph_objs as go
@@ -364,7 +365,9 @@ def draw_marked_line(self, **props):
         if props['coordinates'] == 'data':
             marked_line = go.Scatter(
                 mode=mode,
-                name=props['label'],
+                name=(str(props['label']) if
+                      isinstance(props['label'], six.string_types) else
+                      props['label']),
                 x=[xy_pair[0] for xy_pair in props['data']],
                 y=[xy_pair[1] for xy_pair in props['data']],
                 xaxis='x{0}'.format(self.axis_ct),
@@ -572,7 +575,9 @@ def draw_text(self, **props):
                 xanchor = props['style']['halign']  # no difference here!
                 yanchor = mpltools.convert_va(props['style']['valign'])
             annotation = go.Annotation(
-                text=props['text'],
+                text=(str(props['text']) if
+                      isinstance(props['text'], six.string_types) else
+                      props['text']),
                 opacity=props['style']['alpha'],
                 x=x,
                 y=y,
@@ -674,7 +679,7 @@ def draw_xlabel(self, **props):
         """
         self.msg += "        Adding xlabel\n"
         axis_key = 'xaxis{0}'.format(self.axis_ct)
-        self.plotly_fig['layout'][axis_key]['title'] = props['text']
+        self.plotly_fig['layout'][axis_key]['title'] = str(props['text'])
         titlefont = go.Font(
             size=props['style']['fontsize'],
             color=props['style']['color'])
diff --git a/plotly/tests/test_optional/test_matplotlylib/test_scatter.py b/plotly/tests/test_optional/test_matplotlylib/test_scatter.py
@@ -24,6 +24,9 @@ def test_simple_scatter():
     renderer = run_fig(fig)
     for data_no, data_dict in enumerate(renderer.plotly_fig['data']):
         d1, d2 = strip_dict_params(data_dict, SIMPLE_SCATTER['data'][data_no], ignore=['uid'])
+        print(d1)
+        print('\n')
+        print(d2)
         assert d1 == d2
 
     equivalent, msg = compare_dict(renderer.plotly_fig['layout'],
@@ -39,6 +42,9 @@ def test_double_scatter():
     renderer = run_fig(fig)
     for data_no, data_dict in enumerate(renderer.plotly_fig['data']):
         d1, d2 = strip_dict_params(data_dict, DOUBLE_SCATTER['data'][data_no], ignore=['uid'])
+        print(d1)
+        print('\n')
+        print(d2)
         assert d1 == d2
 
     equivalent, msg = compare_dict(renderer.plotly_fig['layout'],
