Author: mattip <[email protected]>
Branch:
Changeset: r78846:5468f60b0932
Date: 2015-08-07 13:01 +0300
http://bitbucket.org/pypy/pypy/changeset/5468f60b0932/
Log: be more specific about the obscure api, fixes breakage
diff --git a/pypy/module/micronumpy/descriptor.py
b/pypy/module/micronumpy/descriptor.py
--- a/pypy/module/micronumpy/descriptor.py
+++ b/pypy/module/micronumpy/descriptor.py
@@ -1031,7 +1031,8 @@
elif space.isinstance_w(w_dtype, space.w_tuple):
w_dtype0 = space.getitem(w_dtype, space.wrap(0))
w_dtype1 = space.getitem(w_dtype, space.wrap(1))
- if space.isinstance_w(w_dtype0, space.w_type):
+ if space.isinstance_w(w_dtype0, space.w_type) and \
+ space.isinstance_w(w_dtype1, space.w_list):
#obscure api - (subclass, spec). Ignore the subclass
return make_new_dtype(space, w_subtype, w_dtype1, alignment,
copy=copy, w_shape=w_shape, w_metadata=w_metadata)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
