rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Blackened

Browse source
This commit is contained in:
jtc42 2020-01-03 00:21:16 +00:00
parent 6be8b0044a
commit ab6fa9f0e5
11 changed files with 104 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

7
openflexure_microscope/common/flask_labthings/utilities.py
View file

@ -1,4 +1,7 @@
from openflexure_microscope.common.labthings_core.utilities import get_docstring, get_summary
from openflexure_microscope.common.labthings_core.utilities import (
get_docstring,
get_summary,
)
from .schema import Schema, marshmallow, MARSHMALLOW_VERSION_INFO
import collections.abc
@ -25,4 +28,4 @@ def rupdate(d, u):
d[k] = rupdate(d.get(k, {}), v)
else:
d[k] = v
return d
return d