Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b9c1d3ef1298
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 661b9bfbfacd
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 18, 2015

  1. tools/short_format: display booleans directly

    @sbourdeauducq
    sbourdeauducq committed Oct 18, 2015

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    GPG key ID: 8E26FF248BC7AEAD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d7b4120 View commit details

  2. tools/short_format: increase max string length

    @sbourdeauducq
    sbourdeauducq committed Oct 18, 2015

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    GPG key ID: 8E26FF248BC7AEAD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    661b9bf View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 artiq/tools.py
4 changes: 2 additions & 2 deletions artiq/tools.py
View file
Original file line number Diff line number Diff line change
@@ -49,10 +49,10 @@ def short_format(v):
if v is None:
return "None"
t = type(v)
if np.issubdtype(t, int) or np.issubdtype(t, float):
if t is bool or np.issubdtype(t, int) or np.issubdtype(t, float):
return str(v)
elif t is str:
return "\"" + elide(v, 15) + "\""
return "\"" + elide(v, 50) + "\""
else:
r = t.__name__
if t is list or t is dict or t is set: