Author: Alex Gaynor <alex.gay...@gmail.com>
Branch:
Changeset: r50486:238ddc6d667c
Date: 2011-12-13 21:09 -0500
http://bitbucket.org/pypy/pypy/changeset/238ddc6d667c/
Log: fix for numpy tests on <64bit platforms
diff --git a/pypy/module/micronumpy/test/test_dtypes.py
b/pypy/module/micronumpy/test/test_dtypes.py
--- a/pypy/module/micronumpy/test/test_dtypes.py
+++ b/pypy/module/micronumpy/test/test_dtypes.py
@@ -259,22 +259,31 @@
assert numpy.uint16('65536') == 0
def test_int32(self):
+ import sys
import numpypy as numpy
x = numpy.int32(23)
assert x == 23
assert numpy.int32(2147483647) == 2147483647
- assert numpy.int32(2147483648) == -2147483648
assert numpy.int32('2147483647') == 2147483647
- assert numpy.int32('2147483648') == -2147483648
+ if sys.maxint > 2 ** 31 - 1:
+ assert numpy.int32(2147483648) == -2147483648
+ assert numpy.int32('2147483648') == -2147483648
+ else:
+ raises(OverflowError, numpy.int32, 2147483648)
+ raises(OverflowError, numpy.int32, '2147483648')
def test_uint32(self):
+ import sys
import numpypy as numpy
- assert numpy.uint32(4294967295) == 4294967295
- assert numpy.uint32(4294967296) == 0
- assert numpy.uint32('4294967295') == 4294967295
- assert numpy.uint32('4294967296') == 0
+ assert numpy.uint32(10) == 10
+
+ if sys.maxint > 2 ** 31 - 1:
+ assert numpy.uint32(4294967295) == 4294967295
+ assert numpy.uint32(4294967296) == 0
+ assert numpy.uint32('4294967295') == 4294967295
+ assert numpy.uint32('4294967296') == 0
def test_int_(self):
import numpypy as numpy
@@ -294,10 +303,14 @@
assert numpy.dtype(numpy.int64).type is numpy.int64
assert numpy.int64(3) == 3
- assert numpy.int64(9223372036854775807) == 9223372036854775807
+ if sys.maxint >= 2 ** 63 - 1:
+ assert numpy.int64(9223372036854775807) == 9223372036854775807
+ assert numpy.int64('9223372036854775807') == 9223372036854775807
+ else:
+ raises(OverflowError, numpy.int64, 9223372036854775807)
+ raises(OverflowError, numpy.int64, '9223372036854775807')
+
raises(OverflowError, numpy.int64, 9223372036854775808)
-
- assert numpy.int64('9223372036854775807') == 9223372036854775807
raises(OverflowError, numpy.int64, '9223372036854775808')
def test_uint64(self):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
