Skip to content

Fix slow vector3array validation #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fwkoch merged 2 commits into from
Mar 1, 2019
Merged

Fix slow vector3array validation #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37166db
Add coding to conf.py in docs
fwkoch Feb 28, 2019
fc425e7
Vector3Array validation no longer iterates through numpy arrays
fwkoch Feb 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
#
# properties documentation build configuration file, created by
# sphinx-quickstart on Thu May 12 10:22:17 2016.
Expand Down
19 changes: 10 additions & 9 deletions properties/math.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,15 +418,16 @@ def validate(self, instance, value):
"""
if not isinstance(value, (tuple, list, np.ndarray)):
self.error(instance, value)
for i, val in enumerate(value):
if isinstance(val, string_types):
if val.upper() not in VECTOR_DIRECTIONS:
self.error(
instance=instance,
value=val,
extra='This is an invalid Vector3 representation.',
)
value[i] = VECTOR_DIRECTIONS[val.upper()]
if isinstance(value, (tuple, list)):
for i, val in enumerate(value):
if isinstance(val, string_types):
if val.upper() not in VECTOR_DIRECTIONS:
self.error(
instance=instance,
value=val,
extra='This is an invalid Vector3 representation.',
)
value[i] = VECTOR_DIRECTIONS[val.upper()]

return super(Vector3Array, self).validate(instance, value)

Expand Down