Skip to content

Commit d2eb0dc

Browse files
committed
WIP: Fix dtype creation fail
1 parent 3e4de6e commit d2eb0dc

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

h5pyd/_hl/dataset.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,10 @@
3636
def readtime_dtype(basetype, names):
3737
"""Make a NumPy dtype appropriate for reading"""
3838
# Check if basetype is the special case for storing complex numbers
39-
if (
40-
basetype.names is not None
41-
and basetype.names == ("r", "i")
42-
and all(dt.kind == "f" for dt, off in basetype.fields.values())
43-
and basetype.fields["r"][0] == basetype.fields["i"][0]
44-
):
39+
is_complex_basetype = basetype.names is not None and basetype.names == ("r", "i")
40+
is_complex_basetype = is_complex_basetype and all(dt.kind == "f" for dt, off in basetype.fields.values())
41+
is_complex_basetype = is_complex_basetype and basetype.fields["r"][0] == basetype.fields["i"][0]
42+
if is_complex_basetype:
4543
itemsize = basetype.itemsize
4644
if itemsize == 16:
4745
return numpy.dtype(numpy.complex128)

h5pyd/_hl/h5type.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ def createDataType(typeItem):
860860
dtRet = np.dtype(dtName)
861861
return dtRet # return predefined type
862862

863-
if isinstance(typeItem, dict):
863+
if type(typeItem) is not dict:
864864
raise TypeError("invalid type")
865865

866866
if 'class' not in typeItem:

0 commit comments

Comments
 (0)