Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
csadorf committed Apr 3, 2019
2 parents 4579b2a + 8d78124 commit 45cc959
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion signac/core/json.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class CustomJSONEncoder(JSONEncoder):
def default(self, o):
if NUMPY:
if isinstance(o, numpy.number):
return numpy.asscalar(o)
return o.item()
elif isinstance(o, numpy.ndarray):
return o.tolist()
try:
Expand Down

0 comments on commit 45cc959

Please sign in to comment.