Changeset 1450

Timestamp:

Dec 13, 2013 6:19:51 PM (9 years ago)

Author:

jemian

Message:

better to use isinstance() here

File:

• hdf5_exchange/h5py_examples/src/h5toText/h5toText.py (modified) (4 diffs)

hdf5_exchange/h5py_examples/src/h5toText/h5toText.py

@@ -6 +6 @@
 $Id$
 '''
-
-
-########### SVN repository information ###################
-# $Date$
-# $Author$
-# $Revision$
-# $URL$
-# $Id$
-########### SVN repository information ###################
 
 
@@ -61 +52 @@
             f = h5py.File(self.filename, 'r')
             for value in f.itervalues():
-                if str(type(value)) in ("<class 'h5py.highlevel.Group'>"):
+                if isinstance(value, h5py.Group):
                     if 'NX_class' in value.attrs:
                         v = value.attrs['NX_class']
@@ -81 +72 @@
         print indentation + name + nxclass
         self.showAttributes(obj, indentation)
-        group_equivalents = ("<class 'h5py.highlevel.File'>", "<class 'h5py.highlevel.Group'>")
         # show datasets (and links) first
         for itemname in sorted(obj):
             value = obj[itemname]
-            if str(type(value)) not in group_equivalents:
+            if not isinstance(value, h5py.Group):
                 self.showDataset(value, itemname, indentation = indentation+"  ")
         # then show things that look like groups
         for itemname in sorted(obj):
             value = obj[itemname]
-            if str(type(value)) in group_equivalents:
+            if isinstance(value, h5py.Group):
                 self.showGroup(value, itemname, indentation = indentation+"  ")
 
@@ -230 +220 @@
         mc.array_items_shown = limit
         mc.report()
+
+
+########### SVN repository information ###################
+# $Date$
+# $Author$
+# $Revision$
+# $URL$
+# $Id$
+########### SVN repository information ###################