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

Use StringIO from six

Browse Source
This commit is contained in:
Pedro Algarvio 2014-11-19 23:45:31 +00:00
parent d8e74b3f1f
commit 55741d2196
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/modules/virt.py
View File

@ -16,14 +16,15 @@ import shutil
import subprocess
import string # pylint: disable=deprecated-module
import logging
import salt.ext.six as six
# Import third party libs
import yaml
import jinja2
import jinja2.exceptions
import salt.ext.six as six
from salt.ext.six.moves import StringIO as _StringIO # pylint: disable=import-error
try:
import libvirt
import libvirt # pylint: disable=import-error
from xml.dom import minidom
HAS_ALL_IMPORTS = True
except ImportError:
@ -34,7 +35,6 @@ import salt.utils
import salt.utils.files
import salt.utils.templates
import salt.utils.validate.net
from salt._compat import StringIO as _StringIO
from salt.exceptions import CommandExecutionError, SaltInvocationError
log = logging.getLogger(__name__)
@ -1589,7 +1589,7 @@ def is_hyper():
salt '*' virt.is_hyper
'''
try:
import libvirt
import libvirt # pylint: disable=import-error
except ImportError:
# not a usable hypervisor without libvirt module
return False