Skip to content

Commit 95d1816

Browse files
committed
Remove merge error
1 parent f25c63b commit 95d1816

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

awscli/customizations/cloudformation/module_functions.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,6 @@ def vf(v):
7070
if len(mrg) != 2:
7171
msg = f"Fn::Merge requires 2 args: {v.k}: {v.d}"
7272
raise exceptions.InvalidModuleError(msg=msg)
73-
isd1 = isdict(mrg[0])
74-
isd2 = isdict(mrg[1])
75-
isl1 = isinstance(mrg[0], list)
76-
isl2 = isinstance(mrg[1], list)
77-
if not (isd1 and isd2):
78-
if not (isl1 and isl2):
79-
msg = (
80-
"Both args to Fn::Merge must be objects or lists"
81-
+ f": {v.k}: {v.d}"
82-
)
83-
raise exceptions.InvalidModuleError(msg=msg)
8473
v.p[v.k] = merge_props(mrg[0], mrg[1])
8574

8675
Visitor(d).visit(vf)

0 commit comments

Comments
 (0)