saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use fully-qualified path for six

Browse source
This commit is contained in:
Mike Place 2016-10-18 12:18:30 +09:00 • committed by GitHub
parent 0ca1222833
commit 79f3e83f8d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/pip.py
View file

@ -87,7 +87,7 @@ import salt.utils
import tempfile
import salt.utils.locales
import salt.utils.url
from salt.ext.six import string_types, iteritems
import salt.ext.six
from salt.exceptions import CommandExecutionError, CommandNotFoundError
@ -213,7 +213,7 @@ def _resolve_requirements_chain(requirements):
chain = []
if isinstance(requirements, string_types):
if isinstance(requirements, salt.ext.six.string_types):
requirements = [requirements]
for req_file in requirements:
@ -827,7 +827,7 @@ def install(pkgs=None, # pylint: disable=R0912,R0913,R0914
if env_vars:
if isinstance(env_vars, dict):
for k, v in iteritems(env_vars):
for k, v in salt.ext.six.iteritems(env_vars):
if not isinstance(v, string_types):
env_vars[k] = str(v)
os.environ.update(env_vars)