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

Import "salt.ext.six" instead of "six" (#36076)

Browse Source 
The Windows distribution doesn't come with `six` as a pre-installed
python package. Since `salt.ext.six` already exists, it makes sense
to use that instead of adding `six` to the Windows distribution.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
This commit is contained in:
Nicole Thomas 2016-09-06 13:46:51 -06:00 committed by GitHub
parent ad558f14e4
commit af0d4268cd
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/cisconso.py
View File

@ -9,8 +9,8 @@ for :doc:`salt.proxy.cisconso</ref/proxy/all/salt.proxy.cisconso>`.
''' '''
from __future__ import absolute_import from __future__ import absolute_import
import six
import salt.utils import salt.utils
import salt.ext.six as six
__proxyenabled__ = ['cisconso'] __proxyenabled__ = ['cisconso']
__virtualname__ = 'cisconso' __virtualname__ = 'cisconso'

2
salt/returners/sentry_return.py
View File

@ -45,10 +45,10 @@ from __future__ import absolute_import
# Import Python libs # Import Python libs
import logging import logging
import six
# Import Salt libs # Import Salt libs
import salt.utils.jid import salt.utils.jid
import salt.ext.six as six
try: try:
from raven import Client from raven import Client

2
salt/returners/syslog_return.py
View File

@ -88,7 +88,6 @@ To override individual configuration items, append
''' '''
from __future__ import absolute_import from __future__ import absolute_import
import logging import logging
import six
# Import python libs # Import python libs
import json import json
@ -101,6 +100,7 @@ except ImportError:
# Import Salt libs # Import Salt libs
import salt.utils.jid import salt.utils.jid
import salt.returners import salt.returners
import salt.ext.six as six
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
# Define the module's virtual name # Define the module's virtual name