[pypy-commit] pypy default: Make numpy.character usable as a dtype (it's an alias for str)

rguillebert noreply at buildbot.pypy.org
Thu Aug 22 17:04:04 CEST 2013


Author: Romain Guillebert <romain.py at gmail.com>
Branch: 
Changeset: r66290:36f863c1be94
Date: 2013-08-22 17:03 +0200
http://bitbucket.org/pypy/pypy/changeset/36f863c1be94/

Log:	Make numpy.character usable as a dtype (it's an alias for str)

diff --git a/pypy/module/micronumpy/interp_dtype.py b/pypy/module/micronumpy/interp_dtype.py
--- a/pypy/module/micronumpy/interp_dtype.py
+++ b/pypy/module/micronumpy/interp_dtype.py
@@ -685,7 +685,7 @@
             name='string',
             char='S',
             w_box_type = space.gettypefor(interp_boxes.W_StringBox),
-            alternate_constructors=[space.w_str],
+            alternate_constructors=[space.w_str, space.gettypefor(interp_boxes.W_CharacterBox)],
             aliases=["str"],
         )
         self.w_unicodedtype = W_Dtype(
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
@@ -781,7 +781,7 @@
     def test_character_dtype(self):
         from numpypy import array, character
         x = array([["A", "B"], ["C", "D"]], character)
-        assert x == [["A", "B"], ["C", "D"]]
+        assert (x == [["A", "B"], ["C", "D"]]).all()
 
 class AppTestRecordDtypes(BaseNumpyAppTest):
     spaceconfig = dict(usemodules=["micronumpy", "struct", "binascii"])


More information about the pypy-commit mailing list