Skip to content
Snippets Groups Projects
Commit 7063cc31 authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

STY: fix style changes

parent b813d56c
No related branches found
No related tags found
2 merge requests!53Release 0.1,!9ENH: introduce JSON converter
...@@ -197,8 +197,7 @@ class Converter(object): ...@@ -197,8 +197,7 @@ class Converter(object):
converter_registry: dict): converter_registry: dict):
if "type" not in definition: if "type" not in definition:
raise RuntimeError( raise RuntimeError("Type is mandatory for converter entries in CFood definition.")
"Type is mandatory for converter entries in CFood definition.")
if definition["type"] not in converter_registry: if definition["type"] not in converter_registry:
raise RuntimeError("Unknown Type: {}".format(definition["type"])) raise RuntimeError("Unknown Type: {}".format(definition["type"]))
...@@ -265,8 +264,7 @@ class DirectoryConverter(Converter): ...@@ -265,8 +264,7 @@ class DirectoryConverter(Converter):
def create_children(self, generalStore: GeneralStore, def create_children(self, generalStore: GeneralStore,
element: StructureElement): element: StructureElement):
if not isinstance(element, Directory): if not isinstance(element, Directory):
raise RuntimeError( raise RuntimeError("Directory converters can only create children from directories.")
"Directory converters can only create children from directories.")
return self.create_children_from_directory(element) return self.create_children_from_directory(element)
...@@ -336,8 +334,7 @@ class MarkdownFileConverter(Converter): ...@@ -336,8 +334,7 @@ class MarkdownFileConverter(Converter):
if not isinstance(element, File): if not isinstance(element, File):
raise RuntimeError("A markdown file is needed to create children.") raise RuntimeError("A markdown file is needed to create children.")
header = yaml_header_tools.get_header_from_file( header = yaml_header_tools.get_header_from_file(element.path, clean=False)
element.path, clean=False)
children: list[StructureElement] = [] children: list[StructureElement] = []
for name, entry in header.items(): for name, entry in header.items():
...@@ -346,8 +343,7 @@ class MarkdownFileConverter(Converter): ...@@ -346,8 +343,7 @@ class MarkdownFileConverter(Converter):
elif type(entry) == str: elif type(entry) == str:
children.append(DictTextElement(name, entry)) children.append(DictTextElement(name, entry))
else: else:
raise RuntimeError( raise RuntimeError("Header entry {} has incompatible type.".format(name))
"Header entry {} has incompatible type.".format(name))
return children return children
def typecheck(self, element: StructureElement): def typecheck(self, element: StructureElement):
...@@ -476,8 +472,7 @@ class DictListElementConverter(Converter): ...@@ -476,8 +472,7 @@ class DictListElementConverter(Converter):
def create_children(self, generalStore: GeneralStore, def create_children(self, generalStore: GeneralStore,
element: StructureElement): element: StructureElement):
if not isinstance(element, DictListElement): if not isinstance(element, DictListElement):
raise RuntimeError( raise RuntimeError("This converter can only process DictListElements.")
"This converter can only process DictListElements.")
return [TextElement(str(index), list_element) for index, list_element in enumerate(element.value)] return [TextElement(str(index), list_element) for index, list_element in enumerate(element.value)]
def typecheck(self, element: StructureElement): def typecheck(self, element: StructureElement):
...@@ -490,8 +485,7 @@ class DictListElementConverter(Converter): ...@@ -490,8 +485,7 @@ class DictListElementConverter(Converter):
if m is None: if m is None:
return None return None
if "match" in self.definition: if "match" in self.definition:
raise NotImplementedError( raise NotImplementedError("Match is not implemented for DictListElement.")
"Match is not implemented for DictListElement.")
return m.groupdict() return m.groupdict()
......
...@@ -7,3 +7,5 @@ deps = . ...@@ -7,3 +7,5 @@ deps = .
pytest pytest
pytest-cov pytest-cov
commands=py.test --cov=caosdb -vv {posargs} commands=py.test --cov=caosdb -vv {posargs}
[flake8]
max-line-length=100
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment