cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert accidental addition of Mapping in #37741 (#37939)

Browse source
This commit is contained in:
Matt Martz 2018-03-26 13:57:56 -05:00 committed by GitHub
parent ffbbb5a25b
commit 6051ef4041
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/plugins/filter/core.py
View file

@ -34,7 +34,7 @@ import time
import uuid import uuid
import yaml import yaml
from collections import Mapping, MutableMapping, MutableSequence from collections import MutableMapping, MutableSequence
import datetime import datetime
from functools import partial from functools import partial
from random import Random, SystemRandom, shuffle from random import Random, SystemRandom, shuffle
@ -326,7 +326,7 @@ def combine(*terms, **kwargs):
dicts = [] dicts = []
for t in terms: for t in terms:
if isinstance(t, (MutableMapping, Mapping)): if isinstance(t, MutableMapping):
dicts.append(t) dicts.append(t)
elif isinstance(t, list): elif isinstance(t, list):
dicts.append(combine(*t, **kwargs)) dicts.append(combine(*t, **kwargs))