valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pep8 complaint

Browse Source
This commit is contained in:
Ahmed AbouZaid 2017-12-09 00:21:31 +01:00
parent 3e96abaa8d
commit 4057256728
No known key found for this signature in database
GPG Key ID: C9E0470909372BBD
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/modules/defaults.py
View File

@ -129,9 +129,9 @@ def merge(dest, src, merge_lists=False, in_place=True):
instead of directly on the command-line.
'''
if in_place:
merged = dest
merged = dest
else:
merged = copy.deepcopy(dest)
merged = copy.deepcopy(dest)
return dictupdate.update(merged, src, merge_lists=merge_lists)
@ -146,4 +146,4 @@ def deepcopy(source):
It is more typical to use this in a templating language in formulas,
instead of directly on the command-line.
'''
return copy.deepcopy(source)
return copy.deepcopy(source)

2
tests/unit/modules/test_defaults.py
View File

@ -171,4 +171,4 @@ class DefaultsTestCase(TestCase, LoaderModuleMockMixin):
}
self.assertFalse(src == dist)
self.assertTrue(dist == result)
self.assertTrue(dist == result)