Skip to content
Snippets Groups Projects
Commit c1a6d8af authored by Alexander Schlemmer's avatar Alexander Schlemmer
Browse files

STY: whitespace cleanup using autopep8

parent b435fcbc
No related branches found
No related tags found
1 merge request!53Release 0.1
...@@ -34,6 +34,7 @@ from typing import Type, Optional, Union ...@@ -34,6 +34,7 @@ from typing import Type, Optional, Union
from abc import abstractmethod from abc import abstractmethod
import yaml_header_tools import yaml_header_tools
def handle_value(value: Union[dict, str], values: GeneralStore): def handle_value(value: Union[dict, str], values: GeneralStore):
""" """
Function to generically handle values for properties defined in the Function to generically handle values for properties defined in the
...@@ -66,6 +67,7 @@ def handle_value(value: Union[dict, str], values: GeneralStore): ...@@ -66,6 +67,7 @@ def handle_value(value: Union[dict, str], values: GeneralStore):
return (propvalue, collection_mode) return (propvalue, collection_mode)
class Converter(object): class Converter(object):
""" """
Converters treat StructureElements contained in the hierarchical sturcture. Converters treat StructureElements contained in the hierarchical sturcture.
...@@ -252,8 +254,6 @@ class Converter(object): ...@@ -252,8 +254,6 @@ class Converter(object):
elif collection_mode == "single": elif collection_mode == "single":
c_record.get_property(key).value = propvalue c_record.get_property(key).value = propvalue
# no matter whether the record existed in the record store or not, # no matter whether the record existed in the record store or not,
# parents will be added when they aren't present in the record yet: # parents will be added when they aren't present in the record yet:
if "parents" in record: if "parents" in record:
...@@ -265,8 +265,6 @@ class Converter(object): ...@@ -265,8 +265,6 @@ class Converter(object):
c_record.add_parent(name) c_record.add_parent(name)
return keys_modified return keys_modified
@abstractmethod @abstractmethod
def typecheck(self, element: StructureElement): def typecheck(self, element: StructureElement):
pass pass
...@@ -275,6 +273,7 @@ class Converter(object): ...@@ -275,6 +273,7 @@ class Converter(object):
def match(self, element: StructureElement) -> Optional[dict]: def match(self, element: StructureElement) -> Optional[dict]:
pass pass
class DirectoryConverter(Converter): class DirectoryConverter(Converter):
def __init__(self, definition: dict, name: str): def __init__(self, definition: dict, name: str):
...@@ -321,6 +320,7 @@ class DirectoryConverter(Converter): ...@@ -321,6 +320,7 @@ class DirectoryConverter(Converter):
return children return children
class MarkdownFileConverter(Converter): class MarkdownFileConverter(Converter):
def __init__(self, definition: dict, name: str): def __init__(self, definition: dict, name: str):
""" """
...@@ -345,7 +345,6 @@ class MarkdownFileConverter(Converter): ...@@ -345,7 +345,6 @@ class MarkdownFileConverter(Converter):
raise RuntimeError("Header entry {} has incompatible type.".format(name)) raise RuntimeError("Header entry {} has incompatible type.".format(name))
return children return children
def typecheck(self, element: StructureElement): def typecheck(self, element: StructureElement):
return isinstance(element, File) return isinstance(element, File)
...@@ -361,12 +360,12 @@ class MarkdownFileConverter(Converter): ...@@ -361,12 +360,12 @@ class MarkdownFileConverter(Converter):
return None return None
return m.groupdict() return m.groupdict()
class DictTextElementConverter(Converter): class DictTextElementConverter(Converter):
def create_children(self, generalStore: GeneralStore, def create_children(self, generalStore: GeneralStore,
element: StructureElement): element: StructureElement):
return [] return []
def typecheck(self, element: StructureElement): def typecheck(self, element: StructureElement):
return isinstance(element, DictTextElement) return isinstance(element, DictTextElement)
...@@ -384,6 +383,7 @@ class DictTextElementConverter(Converter): ...@@ -384,6 +383,7 @@ class DictTextElementConverter(Converter):
values.update(m2.groupdict()) values.update(m2.groupdict())
return values return values
class DictListElementConverter(Converter): class DictListElementConverter(Converter):
def create_children(self, generalStore: GeneralStore, def create_children(self, generalStore: GeneralStore,
element: StructureElement): element: StructureElement):
...@@ -404,6 +404,7 @@ class DictListElementConverter(Converter): ...@@ -404,6 +404,7 @@ class DictListElementConverter(Converter):
raise NotImplementedError("Match is not implemented for DictListElement.") raise NotImplementedError("Match is not implemented for DictListElement.")
return m.groupdict() return m.groupdict()
class TextElementConverter(Converter): class TextElementConverter(Converter):
def create_children(self, generalStore: GeneralStore, def create_children(self, generalStore: GeneralStore,
element: StructureElement): element: StructureElement):
......
...@@ -136,8 +136,6 @@ class Crawler(object): ...@@ -136,8 +136,6 @@ class Crawler(object):
dirname), dirname),
crawler_definition) crawler_definition)
def start_crawling(self, item: StructureElement, def start_crawling(self, item: StructureElement,
crawler_definition: dict): crawler_definition: dict):
""" """
...@@ -298,7 +296,8 @@ class Crawler(object): ...@@ -298,7 +296,8 @@ class Crawler(object):
for key in ("provenance", "usage"): for key in ("provenance", "usage"):
flatten_debug_info(key) flatten_debug_info(key)
paths["converters_usage"] = [self.debug_build_usage_tree(cv) for cv in self.debug_converters] paths["converters_usage"] = [self.debug_build_usage_tree(
cv) for cv in self.debug_converters]
with open(filename, "w") as f: with open(filename, "w") as f:
f.write(yaml.dump(paths, sort_keys=False)) f.write(yaml.dump(paths, sort_keys=False))
...@@ -345,7 +344,8 @@ class Crawler(object): ...@@ -345,7 +344,8 @@ class Crawler(object):
generalStore_copy.get_storage(), recordStore_copy.get_storage()) generalStore_copy.get_storage(), recordStore_copy.get_storage())
self.debug_metadata["copied"][str(element)] = ( self.debug_metadata["copied"][str(element)] = (
generalStore_copy.get_dict_copied(), recordStore_copy.get_dict_copied()) generalStore_copy.get_dict_copied(), recordStore_copy.get_dict_copied())
self.debug_metadata["usage"][str(element)].add("/".join(converters_path + [converter.name])) self.debug_metadata["usage"][str(element)].add(
"/".join(converters_path + [converter.name]))
mod_info = self.debug_metadata["provenance"] mod_info = self.debug_metadata["provenance"]
for record_name, prop_name in keys_modified: for record_name, prop_name in keys_modified:
# TODO: check # TODO: check
...@@ -366,6 +366,7 @@ class Crawler(object): ...@@ -366,6 +366,7 @@ class Crawler(object):
self.updateList.append(record) self.updateList.append(record)
return self.updateList return self.updateList
def main(*args): def main(*args):
pass pass
......
...@@ -126,7 +126,8 @@ class IdentifiableAdapter(object): ...@@ -126,7 +126,8 @@ class IdentifiableAdapter(object):
property_name_list_B.append(prop) property_name_list_B.append(prop)
if (len(set(property_name_list_B)) != len(property_name_list_B) or len( if (len(set(property_name_list_B)) != len(property_name_list_B) or len(
set(property_name_list_A)) != len(property_name_list_A)): set(property_name_list_A)) != len(property_name_list_A)):
raise RuntimeError("Multi properties used in identifiables can cause unpredictable results.") raise RuntimeError(
"Multi properties used in identifiables can cause unpredictable results.")
return identifiable return identifiable
......
...@@ -80,9 +80,11 @@ class Store(object): ...@@ -80,9 +80,11 @@ class Store(object):
""" """
return self._ids[key] return self._ids[key]
class GeneralStore(Store): class GeneralStore(Store):
pass pass
class RecordStore(Store): class RecordStore(Store):
def get_records_current_scope(self): def get_records_current_scope(self):
......
...@@ -40,6 +40,7 @@ class StructureElement(object): ...@@ -40,6 +40,7 @@ class StructureElement(object):
def get_name(self): def get_name(self):
return self.name return self.name
class FileSystemStructureElement(StructureElement): class FileSystemStructureElement(StructureElement):
def __init__(self, name: str, path: str): def __init__(self, name: str, path: str):
super().__init__(name) super().__init__(name)
...@@ -50,22 +51,27 @@ class FileSystemStructureElement(StructureElement): ...@@ -50,22 +51,27 @@ class FileSystemStructureElement(StructureElement):
"<class \'", "")[:-2] "<class \'", "")[:-2]
return "{}: {}, {}".format(class_name_short, self.name, self.path) return "{}: {}, {}".format(class_name_short, self.name, self.path)
class Directory(FileSystemStructureElement): class Directory(FileSystemStructureElement):
pass pass
class File(FileSystemStructureElement): class File(FileSystemStructureElement):
pass pass
class DictTextElement(StructureElement): class DictTextElement(StructureElement):
def __init__(self, name: str, value: str): def __init__(self, name: str, value: str):
super().__init__(name) super().__init__(name)
self.value = value self.value = value
class DictListElement(StructureElement): class DictListElement(StructureElement):
def __init__(self, name: str, value: list): def __init__(self, name: str, value: list):
super().__init__(name) super().__init__(name)
self.value = value self.value = value
class TextElement(StructureElement): class TextElement(StructureElement):
def __init__(self, name: str, value: str): def __init__(self, name: str, value: str):
super().__init__(name) super().__init__(name)
......
...@@ -28,6 +28,7 @@ from datetime import datetime ...@@ -28,6 +28,7 @@ from datetime import datetime
# Some utility functions, e.g. for extending pylib. # Some utility functions, e.g. for extending pylib.
def has_parent(entity: db.Entity, name: str): def has_parent(entity: db.Entity, name: str):
""" """
A simple check, whether a parent with the given name exists. A simple check, whether a parent with the given name exists.
...@@ -40,6 +41,7 @@ def has_parent(entity: db.Entity, name: str): ...@@ -40,6 +41,7 @@ def has_parent(entity: db.Entity, name: str):
return True return True
return False return False
def get_value(prop): def get_value(prop):
""" Returns the value of a Property """ Returns the value of a Property
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment