Merge pull request #10154 from eric-wieser/fixup-numerictypes

MAINT: Use a StructSequence in place of the typeinfo tuples

1 files changed, 12 insertions, 11 deletions

diff --git a/numpy/f2py/tests/test_array_from_pyobj.py b/numpy/f2py/tests/test_array_from_pyobj.py
index 776ec3471..cd6149c9a 100644
--- a/numpy/f2py/tests/test_array_from_pyobj.py
+++ b/numpy/f2py/tests/test_array_from_pyobj.py
@@ -141,7 +141,7 @@ class Type(object):
             dtype0 = name
             name = None
             for n, i in typeinfo.items():
-                if isinstance(i, tuple) and dtype0.type is i[-1]:
+                if not isinstance(i, type) and dtype0.type is i.type:
                     name = n
                     break
         obj = cls._type_cache.get(name.upper(), None)
@@ -154,11 +154,12 @@ class Type(object):
 
     def _init(self, name):
         self.NAME = name.upper()
+        info = typeinfo[self.NAME]
         self.type_num = getattr(wrap, 'NPY_' + self.NAME)
-        assert_equal(self.type_num, typeinfo[self.NAME][1])
-        self.dtype = typeinfo[self.NAME][-1]
-        self.elsize = typeinfo[self.NAME][2] / 8
-        self.dtypechar = typeinfo[self.NAME][0]
+        assert_equal(self.type_num, info.num)
+        self.dtype = info.type
+        self.elsize = info.bits / 8
+        self.dtypechar = info.char
 
     def cast_types(self):
         return [self.__class__(_m) for _m in _cast_dict[self.NAME]]
@@ -167,28 +168,28 @@ class Type(object):
         return [self.__class__(_m) for _m in _type_names]
 
     def smaller_types(self):
-        bits = typeinfo[self.NAME][3]
+        bits = typeinfo[self.NAME].alignment
         types = []
         for name in _type_names:
-            if typeinfo[name][3] < bits:
+            if typeinfo[name].alignment < bits:
                 types.append(Type(name))
         return types
 
     def equal_types(self):
-        bits = typeinfo[self.NAME][3]
+        bits = typeinfo[self.NAME].alignment
         types = []
         for name in _type_names:
             if name == self.NAME:
                 continue
-            if typeinfo[name][3] == bits:
+            if typeinfo[name].alignment == bits:
                 types.append(Type(name))
         return types
 
     def larger_types(self):
-        bits = typeinfo[self.NAME][3]
+        bits = typeinfo[self.NAME].alignment
         types = []
         for name in _type_names:
-            if typeinfo[name][3] > bits:
+            if typeinfo[name].alignment > bits:
                 types.append(Type(name))
         return types