Blackened
This commit is contained in:
parent
5a0188abd3
commit
15a6f13cd5
4 changed files with 5 additions and 5 deletions
|
|
@ -69,4 +69,3 @@ class NestedStatusProperty(Resource):
|
||||||
return abort(404)
|
return abort(404)
|
||||||
|
|
||||||
return jsonify(value)
|
return jsonify(value)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -36,4 +36,4 @@ class Schema(marshmallow.Schema):
|
||||||
data = self.dump(obj, many=many)
|
data = self.dump(obj, many=many)
|
||||||
else:
|
else:
|
||||||
data = self.dump(obj, many=many).data
|
data = self.dump(obj, many=many).data
|
||||||
return flask.jsonify(data, *args, **kwargs)
|
return flask.jsonify(data, *args, **kwargs)
|
||||||
|
|
|
||||||
|
|
@ -97,6 +97,7 @@ class OpenflexureSettingsFile:
|
||||||
|
|
||||||
# HANDLE BASIC LOADING AND SAVING OF SETTINGS FILES
|
# HANDLE BASIC LOADING AND SAVING OF SETTINGS FILES
|
||||||
|
|
||||||
|
|
||||||
def load_json_file(config_path) -> dict:
|
def load_json_file(config_path) -> dict:
|
||||||
"""
|
"""
|
||||||
Open a .json config file
|
Open a .json config file
|
||||||
|
|
|
||||||
|
|
@ -213,9 +213,9 @@ class ExtensibleSerialInstrument(object):
|
||||||
return self.read_multiline(termination_line)
|
return self.read_multiline(termination_line)
|
||||||
else:
|
else:
|
||||||
logging.debug("Reading response...")
|
logging.debug("Reading response...")
|
||||||
line = (
|
line = self.readline(
|
||||||
self.readline(timeout).strip()
|
timeout
|
||||||
) # question: should we strip the final newline?
|
).strip() # question: should we strip the final newline?
|
||||||
logging.debug(f"Read finished. Got {line}")
|
logging.debug(f"Read finished. Got {line}")
|
||||||
return line
|
return line
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue