[pypy-commit] pypy fix-result-types: return the right int32 dtype instance on 32-bit
rlamy
noreply at buildbot.pypy.org
Sat May 23 20:15:37 CEST 2015
Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: fix-result-types
Changeset: r77509:e78d6543748f
Date: 2015-05-22 21:04 +0100
http://bitbucket.org/pypy/pypy/changeset/e78d6543748f/
Log: return the right int32 dtype instance on 32-bit
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
@@ -928,7 +928,9 @@
self.dtypes_by_name = {}
# we reverse, so the stuff with lower numbers override stuff with
# higher numbers
- for dtype in reversed(self.builtin_dtypes):
+ # However, Long/ULong always take precedence over Intxx
+ for dtype in reversed(
+ [self.w_longdtype, self.w_ulongdtype] + self.builtin_dtypes):
dtype.fields = None # mark these as builtin
self.dtypes_by_num[dtype.num] = dtype
self.dtypes_by_name[dtype.get_name()] = dtype
More information about the pypy-commit
mailing list