valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing a couple issues that did not merge properly.

Browse Source
This commit is contained in:
Gareth J. Greenaway 2019-02-12 09:34:03 -08:00
parent 25b2ca677f
commit 3eee0383c6
No known key found for this signature in database
GPG Key ID: 10B62F8A7CAD7A41
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/pillar.py
View File

@ -156,7 +156,7 @@ def get(key,
'skipped.', default, ret, type(ret).__name__
)
elif isinstance(default, list):
ret = salt.utils.traverse_dict_and_list( # pylint: disable=redefined-variable-type
ret = salt.utils.data.traverse_dict_and_list( # pylint: disable=redefined-variable-type
pillar_dict,
key,
[],

5
salt/output/nested.py
View File

@ -39,11 +39,6 @@ try:
except ImportError:
from collections import Mapping
try:
from collections.abc import Mapping
except ImportError:
from collections import Mapping
class NestDisplay(object):
'''