ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-26 22:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Be more lenient in instance check: MutableMapping is more general than dict

Browse source
This commit is contained in:
Toshio Kuratomi 2015-05-08 13:18:19 -07:00
commit 7f21f270d9
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/vars/__init__.py
View file

@ -22,6 +22,7 @@ __metaclass__ = type
import os import os
from collections import defaultdict from collections import defaultdict
from collections import MutableMapping
try: try:
from hashlib import sha1 from hashlib import sha1
@ -73,7 +74,7 @@ class VariableManager:
def set_extra_vars(self, value): def set_extra_vars(self, value):
''' ensures a clean copy of the extra_vars are used to set the value ''' ''' ensures a clean copy of the extra_vars are used to set the value '''
assert isinstance(value, dict) assert isinstance(value, MutableMapping)
self._extra_vars = value.copy() self._extra_vars = value.copy()
def set_inventory(self, inventory): def set_inventory(self, inventory):
@ -83,7 +84,7 @@ class VariableManager:
''' '''
Validates that both arguments are dictionaries, or an error is raised. Validates that both arguments are dictionaries, or an error is raised.
''' '''
if not (isinstance(a, dict) and isinstance(b, dict)): if not (isinstance(a, MutableMapping) and isinstance(b, MutableMapping)):
raise AnsibleError("failed to combine variables, expected dicts but got a '%s' and a '%s'" % (type(a).__name__, type(b).__name__)) raise AnsibleError("failed to combine variables, expected dicts but got a '%s' and a '%s'" % (type(a).__name__, type(b).__name__))
def _combine_vars(self, a, b): def _combine_vars(self, a, b):