put imports at top of tests and added 's at the start of each exp_trisurf_plot color in 'data'

Kully · Kully · commit 52ab00d962b7 · 2016-08-11T15:48:12.000-04:00
diff --git a/plotly/colors.py b/plotly/colors.py
@@ -19,6 +19,7 @@
 """
 from __future__ import absolute_import
 from plotly import exceptions
+from numbers import Number
 
 DEFAULT_PLOTLY_COLORS = ['rgb(31, 119, 180)', 'rgb(255, 127, 14)',
                          'rgb(44, 160, 44)', 'rgb(214, 39, 40)',
@@ -157,7 +158,6 @@ def color_parser(colors, function):
     - rgb string, hex string or tuple
 
     """
-    from numbers import Number
     if isinstance(colors, str):
         return function(colors)
 
@@ -178,7 +178,6 @@ def validate_colors(colors):
     """
     Validates color(s) and returns an error for invalid colors
     """
-    from numbers import Number
     colors_list = []
 
     if isinstance(colors, str):
@@ -199,8 +198,7 @@ def validate_colors(colors):
             colors_list = list(colors)
 
     if isinstance(colors, dict):
-        for color in colors.values():
-            colors_list.append(color)
+        colors_list.extend(colors.values())
 
     elif isinstance(colors, list):
         colors_list = colors
@@ -242,7 +240,6 @@ def convert_colors_to_same_type(colors, colortype='rgb'):
     Plotly Scale name then the cooresponding colorscale will be outputted and
     colortype will not be applicable
     """
-    from numbers import Number
     colors_list = []
 
     if isinstance(colors, str):
diff --git a/plotly/tests/test_optional/test_figure_factory.py b/plotly/tests/test_optional/test_figure_factory.py
@@ -843,14 +843,14 @@ def test_trisurf_all_args(self):
 
         exp_trisurf_plot = {
             'data': [{'facecolor': np.array(
-                      ['rgb(145.0, 96.0, 143.0)',
-                       'rgb(29.0, 190.0, 201.0)',
-                       'rgb(145.0, 96.0, 143.0)',
-                       'rgb(31.0, 119.0, 180.0)',
-                       'rgb(145.0, 96.0, 143.0)',
-                       'rgb(31.0, 119.0, 180.0)',
-                       'rgb(145.0, 96.0, 143.0)',
-                       'rgb(29.0, 190.0, 201.0)'],
+                      [b'rgb(145.0, 96.0, 143.0)',
+                       b'rgb(29.0, 190.0, 201.0)',
+                       b'rgb(145.0, 96.0, 143.0)',
+                       b'rgb(31.0, 119.0, 180.0)',
+                       b'rgb(145.0, 96.0, 143.0)',
+                       b'rgb(31.0, 119.0, 180.0)',
+                       b'rgb(145.0, 96.0, 143.0)',
+                       b'rgb(29.0, 190.0, 201.0)'],
                       dtype='|S23'
                       ),
                       'i': np.array([3, 1, 1, 5, 7, 3, 5, 7], dtype='int32'),
