Skip to content

Commit f8b63ff

Browse files
committed
[setDim] add checks for labels setter
1 parent af9db29 commit f8b63ff

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

nixio/data_array.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,6 @@ def append_set_dimension(self, labels=None):
9191
index = len(self.dimensions) + 1
9292
setdim = SetDimension.create_new(self, index)
9393
if labels is not None:
94-
if not hasattr(labels, '__iter__') or isinstance(labels, str):
95-
raise ValueError('`labels` has to be a list-like object.')
96-
for label in labels:
97-
if not isinstance(label, str):
98-
raise ValueError(f'`labels` has to contain string objects, not {type(label)}')
99-
if not isinstance(labels, list):
100-
labels = list(labels)
10194
setdim.labels = labels
10295
if self.file.auto_update_timestamps:
10396
self.force_updated_at()

nixio/dimensions.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,13 @@ def labels(self, labels):
684684
raise RuntimeError("The labels of a SetDimension linked to a "
685685
"data object cannot be modified")
686686
dt = util.vlen_str_dtype
687+
if not hasattr(labels, '__iter__') or isinstance(labels, str):
688+
raise ValueError('`labels` has to be a list-like object.')
689+
for label in labels:
690+
if not isinstance(label, str):
691+
raise ValueError(f'`labels` has to contain string objects, not {type(label)}')
692+
if not isinstance(labels, list):
693+
labels = list(labels)
687694
self._h5group.write_data("labels", labels, dtype=dt)
688695

689696
def index_of(self, position, mode=IndexMode.LessOrEqual):

0 commit comments

Comments
 (0)