particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osbuild-mpp: Apply autopep8

Browse source 
Make the code confirm to PEP8.
This commit is contained in:
Jelle van der Waa 2021-12-02 07:50:36 +01:00 • committed by Christian Kellner
parent 9c0ae8d9d2
commit 03af8c632a
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
tools/osbuild-mpp
View file

@ -277,34 +277,41 @@ import hawkey
from osbuild.util.rhsm import Subscriptions from osbuild.util.rhsm import Subscriptions
class YamlOrderedLoader(yaml.Loader): class YamlOrderedLoader(yaml.Loader):
def construct_mapping(self, node, deep=False): def construct_mapping(self, node, deep=False):
if not isinstance(node, yaml.MappingNode): if not isinstance(node, yaml.MappingNode):
raise ConstructorError(None, None, raise ConstructorError(None, None,
"expected a mapping node, but found %s" % node.id, "expected a mapping node, but found %s" % node.id,
node.start_mark) node.start_mark)
mapping = collections.OrderedDict() mapping = collections.OrderedDict()
for key_node, value_node in node.value: for key_node, value_node in node.value:
key = self.construct_object(key_node, deep=deep) key = self.construct_object(key_node, deep=deep)
if not isinstance(key, collections.abc.Hashable): if not isinstance(key, collections.abc.Hashable):
raise ConstructorError("while constructing a mapping", node.start_mark, raise ConstructorError("while constructing a mapping", node.start_mark,
"found unhashable key", key_node.start_mark) "found unhashable key", key_node.start_mark)
value = self.construct_object(value_node, deep=deep) value = self.construct_object(value_node, deep=deep)
mapping[key] = value mapping[key] = value
return mapping return mapping
def construct_yaml_map(self, node): def construct_yaml_map(self, node):
data = collections.OrderedDict() data = collections.OrderedDict()
yield data yield data
value = self.construct_mapping(node) value = self.construct_mapping(node)
data.update(value) data.update(value)
yaml.add_constructor('tag:yaml.org,2002:map', YamlOrderedLoader.construct_yaml_map) yaml.add_constructor('tag:yaml.org,2002:map', YamlOrderedLoader.construct_yaml_map)
def yaml_load_ordered(source): def yaml_load_ordered(source):
return yaml.load(source, YamlOrderedLoader) return yaml.load(source, YamlOrderedLoader)
def json_load_ordered(source): def json_load_ordered(source):
return json.load(source, object_pairs_hook=collections.OrderedDict) return json.load(source, object_pairs_hook=collections.OrderedDict)
def element_enter(element, key, default): def element_enter(element, key, default):
if key not in element: if key not in element:
element[key] = default.copy() element[key] = default.copy()
@ -652,12 +659,12 @@ class ManifestFile:
# We use OrderedDict to preserve key order (for python < 3.6) # We use OrderedDict to preserve key order (for python < 3.6)
if path.endswith(".yml") or path.endswith(".yaml"): if path.endswith(".yml") or path.endswith(".yaml"):
try: try:
data = yaml_load_ordered(f) data = yaml_load_ordered(f)
except yaml.YAMLError as err: except yaml.YAMLError as err:
pos = "" pos = ""
if hasattr(err, 'problem_mark'): if hasattr(err, 'problem_mark'):
mark = err.problem_mark mark = err.problem_mark
pos = f" at line {mark.line+1} (col {mark.column+1})" pos = f" at line {mark.line+1} (col {mark.column+1})"
print(f"Invalid yaml in \"{path}\": {err.problem}{pos}") print(f"Invalid yaml in \"{path}\": {err.problem}{pos}")
sys.exit(1) sys.exit(1)
else: else:
@ -1037,7 +1044,7 @@ class ManifestFileV2(ManifestFile):
else: else:
mpp = self.get_mpp_node(pipeline, "import-pipeline") mpp = self.get_mpp_node(pipeline, "import-pipeline")
if not mpp: if not mpp:
return [pipeline] # Not an import return [pipeline] # Not an import
ids = [mpp["id"]] ids = [mpp["id"]]
path = mpp["path"] path = mpp["path"]