Skip to content

Leaf Export and Property Handling #346

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
mpsonntag merged 15 commits into from
Jan 22, 2020
Merged

Leaf Export and Property Handling #346

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
81d7cf3
[property] Add Leaf-Export
fschrader1992 Jan 8, 2020
a165153
[section] Add Leaf-Export
fschrader1992 Jan 8, 2020
77df9c4
[test-property] Add Test for Leaf-Export
fschrader1992 Jan 8, 2020
1231d2f
[test-section] Add Test for Leaf-Export
fschrader1992 Jan 8, 2020
82ed96c
[property] Specify ValueError Message
fschrader1992 Jan 9, 2020
c6f5617
[test-property] Add Tests for Wrong Value Formats
fschrader1992 Jan 9, 2020
4c007c4
[section] Include Parent Properties in Leaf Export
fschrader1992 Jan 17, 2020
724d8a4
[test_section] Adapt Test for Leaf Export Parent Properties
fschrader1992 Jan 17, 2020
d0d5d9c
[property] Include Parent Properties in Leaf Export
fschrader1992 Jan 17, 2020
537703e
[test_property] Adapt Test for Leaf Export Parent Properties
fschrader1992 Jan 17, 2020
f35a534
[section] Remove Unused Import
fschrader1992 Jan 17, 2020
23a3d45
[section] Change export_leaf Comment
fschrader1992 Jan 17, 2020
5797d20
[property] Change export_leaf Comment and Newline
fschrader1992 Jan 17, 2020
f30bb04
[property] Change values Validation Error Message
fschrader1992 Jan 21, 2020
9095664
[test_property] Fix Wrong Test Dtype
fschrader1992 Jan 21, 2020
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
7 changes: 4 additions & 3 deletions odml/property.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,9 @@ def _validate_values(self, values):
try:
dtypes.get(v, self.dtype)
except Exception:
raise ValueError("odml.Property.values: passed value \'%s\' are not of "
Comment thread
mpsonntag marked this conversation as resolved.
Outdated
"consistent type \'%s\'! Format should be \'%s\'." %
(v, self._dtype, dtypes.default_values(self._dtype)))
return False
Comment thread
mpsonntag marked this conversation as resolved.
return True

Expand Down Expand Up @@ -327,9 +330,7 @@ def values(self, new_value):
if self._dtype is None:
self._dtype = dtypes.infer_dtype(new_value[0])

if not self._validate_values(new_value):
raise ValueError("odml.Property.values: passed values are not of "
"consistent type!")
self._validate_values(new_value)
self._values = [dtypes.get(v, self.dtype) for v in new_value]

@property
Expand Down