Skip to content

Commit

Permalink
fix to_scalar_or_list when v.ndim == 0 (#1444)
Browse files Browse the repository at this point in the history
* fix to_scalar_or_list when v.ndim == 0
* add ndim=0 testcase to protect from regressions
  • Loading branch information
ankokumoyashi authored and jonmmease committed Mar 6, 2019
1 parent df3ea19 commit 2718db3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions _plotly_utils/basevalidators.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ def to_scalar_or_list(v):
if isinstance(v, (list, tuple)):
return [to_scalar_or_list(e) for e in v]
elif np and isinstance(v, np.ndarray):
if v.ndim == 0:
return v.item()
return [to_scalar_or_list(e) for e in v]
elif pd and isinstance(v, (pd.Series, pd.Index)):
return [to_scalar_or_list(e) for e in v]
Expand Down
2 changes: 1 addition & 1 deletion _plotly_utils/tests/validators/test_dataarray_validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def validator():
# -----
# ### Acceptance ###
@pytest.mark.parametrize('val', [
[], [1], [''], (), ('Hello, ', 'world!'), ['A', 1, 'B', 0, 'C']
[], [1], [''], (), ('Hello, ', 'world!'), ['A', 1, 'B', 0, 'C'], [np.array(1), np.array(2)]
])
def test_validator_acceptance_simple(val, validator):
coerce_val = validator.validate_coerce(val)
Expand Down

0 comments on commit 2718db3

Please sign in to comment.