@@ -100,13 +100,13 @@ class ElemList(MutableSequence):
100
100
'''
101
101
def __init__ (self , data = None ):
102
102
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 )
110
110
111
111
def _tuple_from_slice (self , slc ):
112
112
'''Get (start, end, step) tuple from slice object.
@@ -117,7 +117,7 @@ def _tuple_from_slice(self, slc):
117
117
if end < start :
118
118
end = start
119
119
step = None
120
- if slc .step == None :
120
+ if slc .step is None :
121
121
step = None
122
122
return (start , end , step )
123
123
@@ -130,19 +130,19 @@ def __getitem__(self, idx):
130
130
def __setitem__ (self , idx , val ):
131
131
if isinstance (idx , slice ):
132
132
(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 :
143
134
# Normal slice
144
135
for j , assign_val in enumerate (val ):
145
136
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 )
146
146
else :
147
147
self .insert (idx , val )
148
148
0 commit comments