Skip to content

Commit be4129f

Browse files
committed
RF: Minor code cleanup
1 parent b1ad6eb commit be4129f

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

nibabel/elemcont.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@ class ElemList(MutableSequence):
100100
'''
101101
def __init__(self, data=None):
102102
self._elems = list()
103-
if data is not None:
104-
if isinstance(data, self.__class__):
105-
for idx in range(len(data)):
106-
self.append(data.get_elem(idx))
107-
else:
108-
for elem in data:
109-
self.append(elem)
103+
if data is None: return
104+
if isinstance(data, self.__class__):
105+
for idx in range(len(data)):
106+
self.append(data.get_elem(idx))
107+
else:
108+
for elem in data:
109+
self.append(elem)
110110

111111
def _tuple_from_slice(self, slc):
112112
'''Get (start, end, step) tuple from slice object.
@@ -117,7 +117,7 @@ def _tuple_from_slice(self, slc):
117117
if end < start:
118118
end = start
119119
step = None
120-
if slc.step == None:
120+
if slc.step is None:
121121
step = None
122122
return (start, end, step)
123123

@@ -130,19 +130,19 @@ def __getitem__(self, idx):
130130
def __setitem__(self, idx, val):
131131
if isinstance(idx, slice):
132132
(start, end, step) = self._tuple_from_slice(idx)
133-
if step != None:
134-
# Extended slice
135-
indices = range(start, end, step)
136-
if len(val) != len(indices):
137-
raise ValueError(('attempt to assign sequence of size %d' +
138-
' to extended slice of size %d') %
139-
(len(value), len(indices)))
140-
for j, assign_val in enumerate(val):
141-
self.insert(indices[j], assign_val)
142-
else:
133+
if step is None:
143134
# Normal slice
144135
for j, assign_val in enumerate(val):
145136
self.insert(start + j, assign_val)
137+
return
138+
# Extended slice
139+
indices = range(start, end, step)
140+
if len(val) != len(indices):
141+
raise ValueError(('attempt to assign sequence of size %d' +
142+
' to extended slice of size %d') %
143+
(len(value), len(indices)))
144+
for j, assign_val in enumerate(val):
145+
self.insert(indices[j], assign_val)
146146
else:
147147
self.insert(idx, val)
148148

0 commit comments

Comments
 (0)