sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-10-31 07:04:17 +00:00
Code Issues Releases Wiki Activity

wa: pep8 fixes

Browse Source
This commit is contained in:
Marc Bonnici
2018-07-04 17:44:55 +01:00
parent 4b86fa5aee
commit 925bc8b719
36 changed files with 88 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wa/utils/misc.py
View File

@@ -418,7 +418,8 @@ def categorize(v):
else:
return 'c'
#pylint: disable=too-many-return-statements,too-many-branches
# pylint: disable=too-many-return-statements,too-many-branches
def merge_config_values(base, other):
"""
This is used to merge two objects, typically when setting the value of a