Author: Armin Rigo <ar...@tunes.org>
Branch: py3k
Changeset: r87266:c7615cd6e615
Date: 2016-09-21 14:21 +0200
http://bitbucket.org/pypy/pypy/changeset/c7615cd6e615/
Log: hg merge default
diff --git a/pypy/module/array/interp_array.py
b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -33,28 +33,27 @@
if typecode == tc:
a = space.allocate_instance(types[tc].w_class, w_cls)
a.__init__(space)
-
- if len(__args__.arguments_w) > 0:
- w_initializer = __args__.arguments_w[0]
- if isinstance(w_initializer, W_ArrayBase):
- a.extend(w_initializer, True)
- elif space.type(w_initializer) is space.w_list:
- a.descr_fromlist(space, w_initializer)
- else:
- try:
- buf = space.bufferstr_w(w_initializer)
- except OperationError as e:
- if not e.match(space, space.w_TypeError):
- raise
- a.extend(w_initializer, True)
- else:
- a.descr_frombytes(space, buf)
break
else:
raise oefmt(space.w_ValueError,
"bad typecode (must be b, B, u, h, H, i, I, l, L, q, Q, f "
"or d)")
+ if len(__args__.arguments_w) > 0:
+ w_initializer = __args__.arguments_w[0]
+ if isinstance(w_initializer, W_ArrayBase):
+ a.extend(w_initializer, True)
+ elif space.type(w_initializer) is space.w_list:
+ a.descr_fromlist(space, w_initializer)
+ else:
+ try:
+ buf = space.bufferstr_w(w_initializer)
+ except OperationError as e:
+ if not e.match(space, space.w_TypeError):
+ raise
+ a.extend(w_initializer, True)
+ else:
+ a.descr_frombytes(space, buf)
return a
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
