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

Update old utils paths with new utils paths

Browse Source
This commit is contained in:
rallytime 2018-03-06 13:48:16 -05:00
parent d83727fdf9
commit 19ec7b6de1
No known key found for this signature in database
GPG Key ID: E8F1A4B90D0DEA19
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/state.py
View File

@ -1296,7 +1296,7 @@ def sls(mods, test=None, exclude=None, queue=False, **kwargs):
__opts__['test'] = orig_test
try:
with salt.utils.fopen(cfn, 'w+b') as fp_:
with salt.utils.files.fopen(cfn, 'w+b') as fp_:
try:
serial.dump(high_, fp_)
except TypeError:

3
salt/utils/docker/__init__.py
View File

@ -10,7 +10,6 @@ input as formatted by states.
from __future__ import absolute_import, print_function, unicode_literals
import copy
import logging
import os
# Import Salt libs
import salt.utils.args
@ -184,7 +183,7 @@ def translate_input(translator,
of that tuple will have their translation skipped. Optionally,
skip_translate can be set to True to skip *all* translation.
'''
kwargs = copy.deepcopy(salt.utils.clean_kwargs(**kwargs))
kwargs = copy.deepcopy(salt.utils.args.clean_kwargs(**kwargs))
invalid = {}
collisions = []