[pypy-commit] pypy default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r60991:e6bb3153dc24
Date: 2013-02-08 19:39 +0100
http://bitbucket.org/pypy/pypy/changeset/e6bb3153dc24/

Log:	merge heads

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
@@ -529,8 +529,6 @@
         assert numpy.complex128(1.2) == numpy.complex128(complex(1.2, 0))
         assert numpy.complex64(1.2) == numpy.complex64(complex(1.2, 0))
         raises (TypeError, numpy.array, [3+4j], dtype=float)
-        a = (0.5+1.5j)
-        assert '{0:g}'.format(a) == '{0:g}'.format(numpy.complex64(a))
 
     def test_complex(self):
         import _numpypy as numpy
diff --git a/pypy/module/micronumpy/types.py b/pypy/module/micronumpy/types.py
--- a/pypy/module/micronumpy/types.py
+++ b/pypy/module/micronumpy/types.py
@@ -1030,9 +1030,6 @@
     def for_computation(v):   
         return float(v[0]), float(v[1])
 
-    def to_builtin_type(self, space, box):
-        return space.wrap(complex(*self.for_computation(self.unbox(box))))
-
     def read_bool(self, arr, i, offset):
         v = self.for_computation(self._read(arr.storage, i, offset))
         return bool(v[0]) or bool(v[1])