[pypy-commit] pypy default: move test, fix for all cases

[mattip]

Author: mattip <matti.picus at gmail.com>
Branch: 
Changeset: r75125:fb69c75eb931
Date: 2014-12-26 08:28 +0200
http://bitbucket.org/pypy/pypy/changeset/fb69c75eb931/

Log:	move test, fix for all cases

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
@@ -665,6 +665,7 @@
 
         assert numpy.int64(9223372036854775807) == 9223372036854775807
         assert numpy.int64(9223372036854775807) == 9223372036854775807
+        assert numpy.int64(-9223372036854775807) == -9223372036854775807
         raises(OverflowError, numpy.int64, 9223372036854775808)
         raises(OverflowError, numpy.int64, 9223372036854775808L)
 
diff --git a/pypy/module/micronumpy/test/test_ndarray.py b/pypy/module/micronumpy/test/test_ndarray.py
--- a/pypy/module/micronumpy/test/test_ndarray.py
+++ b/pypy/module/micronumpy/test/test_ndarray.py
@@ -287,8 +287,6 @@
         a = np.array('123', dtype='intp')
         assert a == 123
         assert a.dtype == np.intp
-        a = np.array( -(2**60))
-        assert a.dtype == np.int64
 
     def test_array_copy(self):
         from numpy import array
diff --git a/pypy/module/micronumpy/ufuncs.py b/pypy/module/micronumpy/ufuncs.py
--- a/pypy/module/micronumpy/ufuncs.py
+++ b/pypy/module/micronumpy/ufuncs.py
@@ -619,7 +619,7 @@
             space.int_w(w_obj)
         except OperationError, e:
             if e.match(space, space.w_OverflowError):
-                if space.r_longlong_w(w_obj) < 0:
+                if space.is_true(space.le(w_obj, space.wrap(0))):
                     return find_binop_result_dtype(space, int64_dtype,
                                                current_guess)
                 return find_binop_result_dtype(space, uint64_dtype,