Fix validator tests for Python 2.7

Author: jonmmease

Diff for: _plotly_utils/tests/__init__.py

@@ -1,4 +1,5 @@
 import pytest
+#from ..basevalidators import AngleValidator
 from _plotly_utils.basevalidators import AngleValidator
 import numpy as np
 
@@ -33,7 +34,7 @@ def test_coercion(val, expected, validator):
 # ### Test rejection ###
 @pytest.mark.parametrize('val',
                          ['hello', (), [], [1, 2, 3], set(), '34'])
-def test_rejection(val, validator: AngleValidator):
+def test_rejection(val, validator):
     with pytest.raises(ValueError) as validation_failure:
         validator.validate_coerce(val)
 

Diff for: _plotly_utils/tests/validators/__init__.py

@@ -21,7 +21,7 @@ def validator_aok():
 @pytest.mark.parametrize('val', [
     set(), 'Hello', 123, np.inf, np.nan, {}
 ])
-def test_acceptance(val, validator: AnyValidator):
+def test_acceptance(val, validator):
     assert validator.validate_coerce(val) is val
 
 
@@ -36,7 +36,7 @@ def test_acceptance(val, validator: AnyValidator):
     ['Hello', 'World'],
     [np.pi, np.e, {}]
 ])
-def test_acceptance_array(val, validator_aok: AnyValidator):
+def test_acceptance_array(val, validator_aok):
     coerce_val = validator_aok.validate_coerce(val)
     if isinstance(val, np.ndarray):
         assert isinstance(coerce_val, np.ndarray)

Diff for: _plotly_utils/tests/validators/test_angle_validator.py

@@ -16,7 +16,7 @@ def validator():
 
 # Tests
 # -----
-def test_acceptance(validator: BaseDataValidator):
+def test_acceptance(validator):
     val = [Scatter(mode='lines'), Box(fillcolor='yellow')]
     res = validator.validate_coerce(val)
     res_present = validator.present(res)
@@ -36,7 +36,7 @@ def test_acceptance(validator: BaseDataValidator):
     assert res_present[0].uid != res_present[1].uid
 
 
-def test_acceptance_dict(validator: BaseDataValidator):
+def test_acceptance_dict(validator):
     val = (dict(type='scatter', mode='lines'),
            dict(type='box', fillcolor='yellow'))
     res = validator.validate_coerce(val)
@@ -56,7 +56,7 @@ def test_acceptance_dict(validator: BaseDataValidator):
     assert res_present[0].uid != res_present[1].uid
 
 
-def test_default_is_scatter(validator: BaseDataValidator):
+def test_default_is_scatter(validator):
     val = [dict(mode='lines')]
     res = validator.validate_coerce(val)
     res_present = validator.present(res)
@@ -68,7 +68,7 @@ def test_default_is_scatter(validator: BaseDataValidator):
     assert res_present[0].mode == 'lines'
 
 
-def test_rejection_type(validator: BaseDataValidator):
+def test_rejection_type(validator):
     val = 37
 
     with pytest.raises(ValueError) as validation_failure:
@@ -77,7 +77,7 @@ def test_rejection_type(validator: BaseDataValidator):
     assert "Invalid value" in str(validation_failure.value)
 
 
-def test_rejection_element_type(validator: BaseDataValidator):
+def test_rejection_element_type(validator):
     val = [42]
 
     with pytest.raises(ValueError) as validation_failure:
@@ -86,7 +86,7 @@ def test_rejection_element_type(validator: BaseDataValidator):
     assert "Invalid element(s)" in str(validation_failure.value)
 
 
-def test_rejection_element_attr(validator: BaseDataValidator):
+def test_rejection_element_attr(validator):
     val = [dict(type='scatter', bogus=99)]
 
     with pytest.raises(ValueError) as validation_failure:
@@ -97,7 +97,7 @@ def test_rejection_element_attr(validator: BaseDataValidator):
             str(validation_failure.value))
 
 
-def test_rejection_element_tracetype(validator: BaseDataValidator):
+def test_rejection_element_tracetype(validator):
     val = [dict(type='bogus', a=4)]
 
     with pytest.raises(ValueError) as validation_failure:

Diff for: _plotly_utils/tests/validators/test_any_validator.py

@@ -30,14 +30,14 @@ def validator_aok_colorscale():
 @pytest.mark.parametrize('val',
                          ['red', 'BLUE', 'rgb(255, 0, 0)', 'hsl(0, 100%, 50%)', 'hsla(0, 100%, 50%, 100%)',
                           'hsv(0, 100%, 100%)', 'hsva(0, 100%, 100%, 50%)'])
-def test_acceptance(val, validator: ColorValidator):
+def test_acceptance(val, validator):
     assert validator.validate_coerce(val) == val
 
 
 # ### Rejection by type ###
 @pytest.mark.parametrize('val',
                          [set(), 23, 0.5, {}, ['red'], [12]])
-def test_rejection(val, validator: ColorValidator):
+def test_rejection(val, validator):
     with pytest.raises(ValueError) as validation_failure:
         validator.validate_coerce(val)
 
@@ -47,7 +47,7 @@ def test_rejection(val, validator: ColorValidator):
 # ### Rejection by value ###
 @pytest.mark.parametrize('val',
                          ['redd', 'rgbbb(255, 0, 0)', 'hsl(0, 1%0000%, 50%)'])
-def test_rejection(val, validator: ColorValidator):
+def test_rejection(val, validator):
     with pytest.raises(ValueError) as validation_failure:
         validator.validate_coerce(val)
 
@@ -60,14 +60,14 @@ def test_rejection(val, validator: ColorValidator):
 @pytest.mark.parametrize('val',
                          ['red', 'BLUE', 23, 15, 'rgb(255, 0, 0)', 'hsl(0, 100%, 50%)', 'hsla(0, 100%, 50%, 100%)',
                           'hsv(0, 100%, 100%)', 'hsva(0, 100%, 100%, 50%)'])
-def test_acceptance_colorscale(val, validator_colorscale: ColorValidator):
+def test_acceptance_colorscale(val, validator_colorscale):
     assert validator_colorscale.validate_coerce(val) == val
 
 
 # ### Rejection by type ###
 @pytest.mark.parametrize('val',
                          [set(), {}, ['red'], [12]])
-def test_rejection_colorscale(val, validator_colorscale: ColorValidator):
+def test_rejection_colorscale(val, validator_colorscale):
     with pytest.raises(ValueError) as validation_failure:
         validator_colorscale.validate_coerce(val)
 
@@ -77,7 +77,7 @@ def test_rejection_colorscale(val, validator_colorscale: ColorValidator):
 # ### Rejection by value ###
 @pytest.mark.parametrize('val',
                          ['redd', 'rgbbb(255, 0, 0)', 'hsl(0, 1%0000%, 50%)'])
-def test_rejection_colorscale(val, validator_colorscale: ColorValidator):
+def test_rejection_colorscale(val, validator_colorscale):
     with pytest.raises(ValueError) as validation_failure:
         validator_colorscale.validate_coerce(val)
 
@@ -94,7 +94,7 @@ def test_rejection_colorscale(val, validator_colorscale: ColorValidator):
                           ['hsl(0, 100%, 50%)', 'hsla(0, 100%, 50%, 100%)', 'hsv(0, 100%, 100%)'],
                           np.array(['hsl(0, 100%, 50%)', 'hsla(0, 100%, 50%, 100%)', 'hsv(0, 100%, 100%)']),
                           ['hsva(0, 100%, 100%, 50%)']])
-def test_acceptance_aok(val, validator_aok: ColorValidator):
+def test_acceptance_aok(val, validator_aok):
     coerce_val = validator_aok.validate_coerce(val)
 
     if isinstance(val, np.ndarray):
@@ -111,7 +111,7 @@ def test_acceptance_aok(val, validator_aok: ColorValidator):
     [['red', 'rgb(255, 0, 0)'], ['hsl(0, 100%, 50%)', 'hsla(0, 100%, 50%, 100%)']],
     np.array([['red', 'rgb(255, 0, 0)'], ['hsl(0, 100%, 50%)', 'hsla(0, 100%, 50%, 100%)']])
 ])
-def test_acceptance_aok_2D(val, validator_aok: ColorValidator):
+def test_acceptance_aok_2D(val, validator_aok):
     coerce_val = validator_aok.validate_coerce(val)
 
     if isinstance(val, np.ndarray):
@@ -128,7 +128,7 @@ def test_acceptance_aok_2D(val, validator_aok: ColorValidator):
                           ['redd', 'rgb(255, 0, 0)'],
                           ['hsl(0, 100%, 50_00%)', 'hsla(0, 100%, 50%, 100%)', 'hsv(0, 100%, 100%)'],
                           ['hsva(0, 1%00%, 100%, 50%)']])
-def test_rejection_aok(val, validator_aok: ColorValidator):
+def test_rejection_aok(val, validator_aok):
     with pytest.raises(ValueError) as validation_failure:
         validator_aok.validate_coerce(val)
 
@@ -142,7 +142,7 @@ def test_rejection_aok(val, validator_aok: ColorValidator):
                           [np.array(['hsl(0, 100%, 50_00%)', 'hsla(0, 100%, 50%, 100%)']),
                            np.array(['hsv(0, 100%, 100%)', 'purple'])],
                           [['blue'], [2]]])
-def test_rejection_aok_2D(val, validator_aok: ColorValidator):
+def test_rejection_aok_2D(val, validator_aok):
     with pytest.raises(ValueError) as validation_failure:
         validator_aok.validate_coerce(val)
 
@@ -157,7 +157,7 @@ def test_rejection_aok_2D(val, validator_aok: ColorValidator):
                           ['red', 0.5, 'rgb(255, 0, 0)'],
                           ['hsl(0, 100%, 50%)', 'hsla(0, 100%, 50%, 100%)', 'hsv(0, 100%, 100%)'],
                           ['hsva(0, 100%, 100%, 50%)']])
-def test_acceptance_aok_colorscale(val, validator_aok_colorscale: ColorValidator):
+def test_acceptance_aok_colorscale(val, validator_aok_colorscale):
     coerce_val = validator_aok_colorscale.validate_coerce(val)
     if isinstance(val, (list, np.ndarray)):
         assert np.array_equal(list(coerce_val), val)
@@ -170,7 +170,7 @@ def test_acceptance_aok_colorscale(val, validator_aok_colorscale: ColorValidator
                          [['redd', 0.5, 'rgb(255, 0, 0)'],
                           ['hsl(0, 100%, 50_00%)', 'hsla(0, 100%, 50%, 100%)', 'hsv(0, 100%, 100%)'],
                           ['hsva(0, 1%00%, 100%, 50%)']])
-def test_rejection_aok_colorscale(val, validator_aok_colorscale: ColorValidator):
+def test_rejection_aok_colorscale(val, validator_aok_colorscale):
     with pytest.raises(ValueError) as validation_failure:
         validator_aok_colorscale.validate_coerce(val)
 
@@ -180,25 +180,25 @@ def test_rejection_aok_colorscale(val, validator_aok_colorscale: ColorValidator)
 # Description
 # -----------
 # Test dynamic description logic
-def test_description(validator: ColorValidator):
+def test_description(validator):
     desc = validator.description()
     assert 'A number that will be interpreted as a color' not in desc
     assert 'A list or array of any of the above' not in desc
 
 
-def test_description_aok(validator_aok: ColorValidator):
+def test_description_aok(validator_aok):
     desc = validator_aok.description()
     assert 'A number that will be interpreted as a color' not in desc
     assert 'A list or array of any of the above' in desc
 
 
-def test_description_aok(validator_colorscale: ColorValidator):
+def test_description_aok(validator_colorscale):
     desc = validator_colorscale.description()
     assert 'A number that will be interpreted as a color' in desc
     assert 'A list or array of any of the above' not in desc
 
 
-def test_description_aok_colorscale(validator_aok_colorscale: ColorValidator):
+def test_description_aok_colorscale(validator_aok_colorscale):
     desc = validator_aok_colorscale.description()
     assert 'A number that will be interpreted as a color' in desc
     assert 'A list or array of any of the above' in desc

Diff for: _plotly_utils/tests/validators/test_basetraces_validator.py

@@ -20,7 +20,7 @@ def named_colorscale(request):
 # Tests
 # -----
 # ### Acceptance by name ###
-def test_acceptance_named(named_colorscale, validator: ColorscaleValidator):
+def test_acceptance_named(named_colorscale, validator):
     # As-is
     assert validator.validate_coerce(named_colorscale) == named_colorscale
 
@@ -36,7 +36,7 @@ def test_acceptance_named(named_colorscale, validator: ColorscaleValidator):
     ((0.1, 'rgb(255,0,0)'), (0.3, 'green')),
     ((0, 'purple'), (0.2, 'yellow'), (1.0, 'rgba(255,0,0,100)')),
 ])
-def test_acceptance_array(val, validator: ColorscaleValidator):
+def test_acceptance_array(val, validator):
     assert validator.validate_coerce(val) == val
 
 # ### Coercion as array ###
@@ -45,7 +45,7 @@ def test_acceptance_array(val, validator: ColorscaleValidator):
     [(0.1, 'rgb(255, 0, 0)'), (0.3, 'GREEN')],
     (np.array([0, 'Purple'], dtype='object'), (0.2, 'yellow'), (1.0, 'RGBA(255,0,0,100)')),
 ])
-def test_acceptance_array(val, validator: ColorscaleValidator):
+def test_acceptance_array(val, validator):
     # Compute expected (tuple of tuples where color is
     # lowercase with no spaces)
     expected = [[e[0], e[1]] for e in val]
@@ -60,7 +60,7 @@ def test_acceptance_array(val, validator: ColorscaleValidator):
 @pytest.mark.parametrize('val', [
     23, set(), {}, np.pi
 ])
-def test_rejection_type(val, validator: ColorscaleValidator):
+def test_rejection_type(val, validator):
     with pytest.raises(ValueError) as validation_failure:
         validator.validate_coerce(val)
 
@@ -71,7 +71,7 @@ def test_rejection_type(val, validator: ColorscaleValidator):
 @pytest.mark.parametrize('val', [
     'Invalid', ''
 ])
-def test_rejection_str_value(val, validator: ColorscaleValidator):
+def test_rejection_str_value(val, validator):
     with pytest.raises(ValueError) as validation_failure:
         validator.validate_coerce(val)
 
@@ -87,7 +87,7 @@ def test_rejection_str_value(val, validator: ColorscaleValidator):
     ([0.1, 'purple'], [0.2, 123]),                  # Color not a string
     ([0.1, 'purple'], [0.2, 'yellowww']),           # Invalid color string
 ])
-def test_rejection_array(val, validator: ColorscaleValidator):
+def test_rejection_array(val, validator):
     with pytest.raises(ValueError) as validation_failure:
         validator.validate_coerce(val)
 

Diff for: _plotly_utils/tests/validators/test_color_validator.py

@@ -14,7 +14,7 @@ def validator():
 
 # Tests
 # -----
-def test_acceptance(validator: CompoundValidator):
+def test_acceptance(validator):
     val = Marker(color='green', size=10)
     res = validator.validate_coerce(val)
 
@@ -23,7 +23,7 @@ def test_acceptance(validator: CompoundValidator):
     assert res.size == 10
 
 
-def test_acceptance_none(validator: CompoundValidator):
+def test_acceptance_none(validator):
     val = None
     res = validator.validate_coerce(val)
 
@@ -32,7 +32,7 @@ def test_acceptance_none(validator: CompoundValidator):
     assert res.size is None
 
 
-def test_acceptance_dict(validator: CompoundValidator):
+def test_acceptance_dict(validator):
     val = dict(color='green', size=10)
     res = validator.validate_coerce(val)
 
@@ -41,7 +41,7 @@ def test_acceptance_dict(validator: CompoundValidator):
     assert res.size == 10
 
 
-def test_rejection_type(validator: CompoundValidator):
+def test_rejection_type(validator):
     val = 37
 
     with pytest.raises(ValueError) as validation_failure:
@@ -50,7 +50,7 @@ def test_rejection_type(validator: CompoundValidator):
     assert "Invalid value" in str(validation_failure.value)
 
 
-def test_rejection_value(validator: CompoundValidator):
+def test_rejection_value(validator):
     val = dict(color='green', size=10, bogus=99)
 
     with pytest.raises(ValueError) as validation_failure:

Diff for: _plotly_utils/tests/validators/test_colorscale_validator.py

@@ -2,6 +2,7 @@
 from _plotly_utils.basevalidators import CompoundArrayValidator
 from plotly.graph_objs.layout import Image
 
+
 # Fixtures
 # --------
 @pytest.fixture()
@@ -13,7 +14,7 @@ def validator():
 
 # Tests
 # -----
-def test_acceptance(validator: CompoundArrayValidator):
+def test_acceptance(validator):
     val = [Image(opacity=0.5, sizex=120), Image(x=99)]
     res = validator.validate_coerce(val)
     res_present = validator.present(res)
@@ -30,7 +31,7 @@ def test_acceptance(validator: CompoundArrayValidator):
     assert res_present[1].x == 99
 
 
-def test_acceptance_empty(validator: CompoundArrayValidator):
+def test_acceptance_empty(validator):
     val = [{}]
     res = validator.validate_coerce(val)
     res_present = validator.present(res)
@@ -43,7 +44,7 @@ def test_acceptance_empty(validator: CompoundArrayValidator):
     assert res_present[0].x is None
 
 
-def test_acceptance_dict(validator: CompoundArrayValidator):
+def test_acceptance_dict(validator):
     val = [dict(opacity=0.5, sizex=120), dict(x=99)]
     res = validator.validate_coerce(val)
     res_present = validator.present(res)
@@ -61,7 +62,7 @@ def test_acceptance_dict(validator: CompoundArrayValidator):
     assert res_present[1].x == 99
 
 
-def test_rejection_type(validator: CompoundArrayValidator):
+def test_rejection_type(validator):
     val = 37
 
     with pytest.raises(ValueError) as validation_failure:
@@ -70,7 +71,7 @@ def test_rejection_type(validator: CompoundArrayValidator):
     assert "Invalid value" in str(validation_failure.value)
 
 
-def test_rejection_element(validator: CompoundArrayValidator):
+def test_rejection_element(validator):
     val = ['a', 37]
 
     with pytest.raises(ValueError) as validation_failure:
@@ -79,7 +80,7 @@ def test_rejection_element(validator: CompoundArrayValidator):
     assert "Invalid element(s)" in str(validation_failure.value)
 
 
-def test_rejection_value(validator: CompoundArrayValidator):
+def test_rejection_value(validator):
     val = [dict(opacity=0.5, sizex=120, bogus=100)]
 
     with pytest.raises(ValueError) as validation_failure: