M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

short_format: cover a few more numpy types correctly

This commit is contained in:
Robert Jördens 2016-05-21 20:11:08 +02:00
parent 9e681590cb
commit 0857cfdcb1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/tools.py
View File

@ -58,9 +58,9 @@ def short_format(v):
if v is None: if v is None:
return "None" return "None"
t = type(v) t = type(v)
if t is bool or np.issubdtype(t, int) or np.issubdtype(t, float): if np.issubdtype(t, np.number) or np.issubdtype(t, np.bool_):
return str(v) return str(v)
elif t is str: elif np.issubdtype(t, np.unicode_):
return "\"" + elide(v, 50) + "\"" return "\"" + elide(v, 50) + "\""
else: else:
r = t.__name__ r = t.__name__