[pypy-commit] pypy default: cleanup interp_dtype

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r69344:d11918648b16
Date: 2014-02-23 22:02 -0500
http://bitbucket.org/pypy/pypy/changeset/d11918648b16/

Log:	cleanup interp_dtype

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
@@ -536,54 +536,53 @@
         try:
             size = int(name[1:])
         except ValueError:
-            raise OperationError(space.w_TypeError, space.wrap("data type not understood"))
+            raise oefmt(space.w_TypeError, "data type not understood")
     if char == NPY.CHARLTR:
         char = NPY.STRINGLTR
         size = 1
 
     if char == NPY.STRINGLTR:
-        itemtype = types.StringType()
-        name = 'string'
-        num = NPY.STRING
-        w_box_type = space.gettypefor(interp_boxes.W_StringBox)
+        return new_string_dtype(space, size)
+    elif char == NPY.UNICODELTR:
+        return new_unicode_dtype(space, size)
     elif char == NPY.VOIDLTR:
-        itemtype = types.VoidType()
-        name = 'void'
-        num = NPY.VOID
-        w_box_type = space.gettypefor(interp_boxes.W_VoidBox)
-    elif char == NPY.UNICODELTR:
-        itemtype = types.UnicodeType()
-        name = 'unicode'
-        num = NPY.UNICODE
-        w_box_type = space.gettypefor(interp_boxes.W_UnicodeBox)
-    else:
-        assert False
-    return W_Dtype(itemtype, num, char, name, char, w_box_type, size=size)
+        return new_void_dtype(space, size)
+    assert False
 
 
 def new_string_dtype(space, size):
-    itemtype = types.StringType()
     return W_Dtype(
-        itemtype,
+        types.StringType(),
         size=size,
         num=NPY.STRING,
         kind=NPY.STRINGLTR,
         name='string',
         char=NPY.STRINGLTR,
-        w_box_type = space.gettypefor(interp_boxes.W_StringBox),
+        w_box_type=space.gettypefor(interp_boxes.W_StringBox),
     )
 
 
 def new_unicode_dtype(space, size):
-    itemtype = types.UnicodeType()
     return W_Dtype(
-        itemtype,
+        types.UnicodeType(),
         size=size,
         num=NPY.UNICODE,
         kind=NPY.UNICODELTR,
         name='unicode',
         char=NPY.UNICODELTR,
-        w_box_type = space.gettypefor(interp_boxes.W_UnicodeBox),
+        w_box_type=space.gettypefor(interp_boxes.W_UnicodeBox),
+    )
+
+
+def new_void_dtype(space, size):
+    return W_Dtype(
+        types.VoidType(),
+        size=size,
+        num=NPY.VOID,
+        kind=NPY.VOIDLTR,
+        name='void',
+        char=NPY.VOIDLTR,
+        w_box_type=space.gettypefor(interp_boxes.W_VoidBox),
     )