ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-02 14:40:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use arg_spec type for comparisons on default and choices (#37741)

Browse source 
* Use arg_spec type for comparisons on default and choices

* Further improve type casting

* Make sure to capture output in more places

* Individually report invalid choices

* Update ignore.txt after resolving merge conflicts
This commit is contained in:
Matt Martz 2018-03-26 12:15:32 -05:00 • committed by GitHub
parent 9890ce47e8
commit ffbbb5a25b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 330 additions and 206 deletions
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 yaml
from collections import MutableMapping, MutableSequence
from collections import Mapping, MutableMapping, MutableSequence
import datetime
from functools import partial
from random import Random, SystemRandom, shuffle
@ -326,7 +326,7 @@ def combine(*terms, **kwargs):
dicts = []
for t in terms:
if isinstance(t, MutableMapping):
if isinstance(t, (MutableMapping, Mapping)):
dicts.append(t)
elif isinstance(t, list):
dicts.append(combine(*t, **kwargs))