From 6e46ab589159576abd198e55da11ed7752cd251e Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Tue, 14 Jan 2020 15:05:50 +0000 Subject: [PATCH] Added default UUID serialisation --- openflexure_microscope/config.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openflexure_microscope/config.py b/openflexure_microscope/config.py index bfe09ced..d0d730f8 100644 --- a/openflexure_microscope/config.py +++ b/openflexure_microscope/config.py @@ -3,6 +3,7 @@ import os import errno import logging import shutil +from uuid import UUID import numpy as np from fractions import Fraction @@ -23,8 +24,10 @@ class JSONEncoder(json.JSONEncoder): """ def default(self, o, markers=None): + if isinstance(o, UUID): + return str(o) # PiCamera fractions - if isinstance(o, Fraction): + elif isinstance(o, Fraction): return float(o) # Numpy integers elif isinstance(o, np.integer):