return numpy boolean type for enums that match h5py boolean convention

Author: jreadey

h5json/hdf5dtype.py

@@ -488,8 +488,14 @@ def createBaseDataType(typeItem):
         mapping = typeItem["mapping"]
         if len(mapping) == 0:
             raise KeyError("empty enum map")
+        
         dt = createBaseDataType(base_json)
-        dtRet = special_dtype(enum=(dt, mapping))
+        if dt.kind == 'i' and dt.name=='int8' and len(mapping) == 2 and 'TRUE' in mapping and 'FALSE' in mapping:
+            # convert to numpy boolean type
+            dtRet = np.dtype("bool")
+        else:
+            # not a boolean enum, use h5py special dtype 
+            dtRet = special_dtype(enum=(dt, mapping))
 
     else:
         raise TypeError("Invalid type class")

test/unit/hdf5dtypeTest.py

@@ -97,6 +97,20 @@ def testBaseEnumTypeItem(self):
         self.assertEqual(typeItem['mapping']['GREEN'], 1)
         self.assertEqual(typeSize, 1)
 
+    def testBaseBoolTypeItem(self):
+        typeItem = hdf5dtype.getTypeItem(np.dtype('bool'))
+        typeSize = hdf5dtype.getItemSize(typeItem)
+        self.assertEqual(typeItem['class'], 'H5T_ENUM')
+        baseItem = typeItem['base']
+        self.assertEqual(baseItem['class'], 'H5T_INTEGER')
+        self.assertEqual(baseItem['base'], 'H5T_STD_I8LE')
+        self.assertTrue('mapping' in typeItem)
+        mapping = typeItem['mapping']
+        self.assertEqual(len(mapping), 2)
+        self.assertEqual(mapping['FALSE'], 0)
+        self.assertEqual(mapping['TRUE'], 1)
+        self.assertEqual(typeSize, 1)
+
     def testBaseArrayTypeItem(self):
         dt = np.dtype('(2,2)<int32')
         typeItem = hdf5dtype.getTypeItem(dt)
@@ -353,6 +367,54 @@ def testCreateOpaqueType(self):
         self.assertEqual(dt.kind, 'V')
         self.assertEqual(typeSize, 200)
 
+    def testCreateEnumType(self):
+        typeItem = {
+                "class": "H5T_ENUM",
+                "base": {
+                    "base": "H5T_STD_I16LE",
+                    "class": "H5T_INTEGER"
+                }, 
+                "mapping": {
+                    "GAS": 2,
+                    "LIQUID": 1,
+                    "PLASMA": 3,
+                    "SOLID": 0
+                }
+            }
+
+        typeSize = hdf5dtype.getItemSize(typeItem)
+        self.assertEqual(typeSize, 2)
+        dt = hdf5dtype.createDataType(typeItem)
+        self.assertEqual(dt.name, 'int16')
+        self.assertEqual(dt.kind, 'i')    
+        mapping = check_dtype(enum=dt)
+        self.assertTrue(isinstance(mapping, dict))
+        self.assertEqual(mapping["SOLID"], 0)
+        self.assertEqual(mapping["LIQUID"], 1)
+        self.assertEqual(mapping["GAS"], 2)
+        self.assertEqual(mapping["PLASMA"], 3)
+
+    def testCreateBoolType(self):
+        typeItem = {
+                "class": "H5T_ENUM",
+                "base": {
+                    "base": "H5T_STD_I8LE",
+                    "class": "H5T_INTEGER"
+                }, 
+                "mapping": {
+                    "TRUE": 1,
+                    "FALSE": 0
+                }
+            }
+
+        typeSize = hdf5dtype.getItemSize(typeItem)
+        self.assertEqual(typeSize, 1)
+        dt = hdf5dtype.createDataType(typeItem)
+        self.assertEqual(dt.name, 'bool')
+        self.assertEqual(dt.kind, 'b')    
+         
+
+
     def testCreateCompoundType(self):
         typeItem = {
             'class': 'H5T_COMPOUND', 'fields':