mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 09:23:56 +00:00
Py3 compatibility fixes.
This commit is contained in:
parent
748037e013
commit
c35f50e2ac
@ -8,11 +8,10 @@ from __future__ import absolute_import
|
||||
import logging
|
||||
|
||||
# Import 3rd-party libs
|
||||
from salt.ext.six.moves import range, shlex_quote as _cmd_quote # pylint: disable=import-error,redefined-builtin
|
||||
try:
|
||||
from shlex import quote as _cmd_quote # pylint: disable=E0611
|
||||
except ImportError:
|
||||
from pipes import quote as _cmd_quote
|
||||
# pylint: disable=import-error,redefined-builtin
|
||||
from salt.ext.six.moves import range
|
||||
from salt.ext.six.moves import shlex_quote as _cmd_quote
|
||||
# pylint: enable=import-error,redefined-builtin
|
||||
|
||||
# Import salt libs
|
||||
import salt.utils
|
||||
|
Loading…
Reference in New Issue
Block a user