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

Making salt.modules.boto_elb python3 compatible

Browse source
This commit is contained in:
Nitin Madhok 2014-11-10 17:03:38 -05:00
parent d589e9f7db
commit eae1930cc4
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/boto_elb.py
View file

@ -33,10 +33,12 @@ Connection module for Amazon ELB
:depends: boto
'''
from __future__ import absolute_import
# Import Python libs
import logging
import json
import six
log = logging.getLogger(__name__)
@ -513,7 +515,7 @@ def register_instances(name, instances, region=None, key=None, keyid=None,
'''
# convert instances to list type, enabling consistent use of instances
# variable throughout the register_instances method
if isinstance(instances, str) or isinstance(instances, unicode):
if isinstance(instances, str) or isinstance(instances, six.text_type):
instances = [instances]
conn = _get_conn(region, key, keyid, profile)
if not conn:
@ -556,7 +558,7 @@ def deregister_instances(name, instances, region=None, key=None, keyid=None,
'''
# convert instances to list type, enabling consistent use of instances
# variable throughout the deregister_instances method
if isinstance(instances, str) or isinstance(instances, unicode):
if isinstance(instances, str) or isinstance(instances, six.text_type):
instances = [instances]
conn = _get_conn(region, key, keyid, profile)
if not conn: