diff --git a/openflexure_microscope/api/v2/views/state.py b/openflexure_microscope/api/v2/views/state.py index e755289a..176ae0ea 100644 --- a/openflexure_microscope/api/v2/views/state.py +++ b/openflexure_microscope/api/v2/views/state.py @@ -69,4 +69,3 @@ class NestedStatusProperty(Resource): return abort(404) return jsonify(value) - diff --git a/openflexure_microscope/common/labthings/schema.py b/openflexure_microscope/common/labthings/schema.py index 4c2f3c95..3652e208 100644 --- a/openflexure_microscope/common/labthings/schema.py +++ b/openflexure_microscope/common/labthings/schema.py @@ -36,4 +36,4 @@ class Schema(marshmallow.Schema): data = self.dump(obj, many=many) else: data = self.dump(obj, many=many).data - return flask.jsonify(data, *args, **kwargs) \ No newline at end of file + return flask.jsonify(data, *args, **kwargs) diff --git a/openflexure_microscope/config.py b/openflexure_microscope/config.py index 659b7287..d7c61510 100644 --- a/openflexure_microscope/config.py +++ b/openflexure_microscope/config.py @@ -97,6 +97,7 @@ class OpenflexureSettingsFile: # HANDLE BASIC LOADING AND SAVING OF SETTINGS FILES + def load_json_file(config_path) -> dict: """ Open a .json config file diff --git a/openflexure_microscope/stage/sangaboard/extensible_serial_instrument.py b/openflexure_microscope/stage/sangaboard/extensible_serial_instrument.py index 91c53a7b..90534d6c 100644 --- a/openflexure_microscope/stage/sangaboard/extensible_serial_instrument.py +++ b/openflexure_microscope/stage/sangaboard/extensible_serial_instrument.py @@ -213,9 +213,9 @@ class ExtensibleSerialInstrument(object): return self.read_multiline(termination_line) else: logging.debug("Reading response...") - line = ( - self.readline(timeout).strip() - ) # question: should we strip the final newline? + line = self.readline( + timeout + ).strip() # question: should we strip the final newline? logging.debug(f"Read finished. Got {line}") return line