ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 19:31:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

[PR #8833/26df6c76 backport][stable-9] use dict comprehension in plugins, part 3 (#8835)

Browse source 
use dict comprehension in plugins, part 3 (#8833)

* use dict comprehension in plugins, part 3

* add changelog frag

(cherry picked from commit 26df6c7657)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
patchback[bot] 2024-09-08 14:46:13 +02:00 • committed by GitHub
parent 1978100d25
commit 186d410f63
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 81 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/modules/imc_rest.py
View file

@ -323,8 +323,7 @@ def merge(one, two):
''' Merge two complex nested datastructures into one'''
if isinstance(one, dict) and isinstance(two, dict):
copy = dict(one)
# copy.update({key: merge(one.get(key, None), two[key]) for key in two})
copy.update(dict((key, merge(one.get(key, None), two[key])) for key in two))
copy.update({key: merge(one.get(key, None), two[key]) for key in two})
return copy
elif isinstance(one, list) and isinstance(two, list):