mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-09 11:49:14 +00:00
Code Activity

make it python3.4 compatible

Browse Source
This commit is contained in:
deadc0de6
2019-05-31 18:38:09 +02:00
parent 6e6c5fb2e3
commit 015874ea25
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dotdrop/cfg_yaml.py
View File

@@ -457,9 +457,9 @@ class CfgYaml:
self.log.dbg('found: {}'.format(new)) self.log.dbg('found: {}'.format(new))
if isinstance(current, dict) and isinstance(new, dict): if isinstance(current, dict) and isinstance(new, dict):
# imported entries get more priority than current # imported entries get more priority than current
current = {**current, **new} current = self._merge_dict(new, current)
elif isinstance(current, list) and isinstance(new, list): elif isinstance(current, list) and isinstance(new, list):
current = [*current, *new] current = current + new
else: else:
raise Exception('invalid import {} from {}'.format(key, path)) raise Exception('invalid import {} from {}'.format(key, path))
if self.debug: if self.debug:
@@ -468,7 +468,11 @@ class CfgYaml:
def _merge_dict(self, high, low): def _merge_dict(self, high, low):
"""merge low into high""" """merge low into high"""
return {**low, **high} # won't work in python3.4
# return {**low, **high}
new = low.copy()
new.update(high)
return new
def _get_entry(self, yaml_dict, key, mandatory=True): def _get_entry(self, yaml_dict, key, mandatory=True):
"""return entry from yaml dictionary""" """return entry from yaml dictionary"""