From abd291f1e0599f4e9b51469ea2d54f639344421d Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Thu, 23 Apr 2020 14:25:19 +0100 Subject: [PATCH] Base OFM JSON encoder on LabThings encoder --- openflexure_microscope/config.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openflexure_microscope/config.py b/openflexure_microscope/config.py index 3cd36f72..6657de24 100644 --- a/openflexure_microscope/config.py +++ b/openflexure_microscope/config.py @@ -8,6 +8,8 @@ from uuid import UUID import numpy as np from fractions import Fraction +from labthings.server.representations import LabThingsJSONEncoder + from .paths import ( SETTINGS_FILE_PATH, DEFAULT_SETTINGS_FILE_PATH, @@ -77,7 +79,7 @@ class OpenflexureSettingsFile: return settings -class JSONEncoder(flask.json.JSONEncoder): +class JSONEncoder(LabThingsJSONEncoder): """ A custom JSON encoder, with type conversions for PiCamera fractions, Numpy integers, and Numpy arrays """ @@ -100,7 +102,7 @@ class JSONEncoder(flask.json.JSONEncoder): else: # call base class implementation which takes care of # raising exceptions for unsupported types - return flask.json.JSONEncoder.default(self, o) + return LabThingsJSONEncoder.default(self, o) # HANDLE BASIC LOADING AND SAVING OF SETTINGS FILES