Making salt/cloud/clouds/botocore_aws python3 compatible

This commit is contained in:
Nitin Madhok 2014-11-12 14:46:02 -05:00
parent 33a97c3f8d
commit c35fbfdda6

View File

@ -28,6 +28,7 @@ If this driver is still needed, set up the cloud configuration at
provider: aws
'''
from __future__ import absolute_import
# pylint: disable=E0102
# Import python libs
@ -39,6 +40,7 @@ import logging
import salt.config as config
from salt.utils import namespaced_function
from salt.exceptions import SaltCloudException, SaltCloudSystemExit
import six
# Import libcloudfuncs and libcloud_aws, required to latter patch __opts__
try:
@ -84,7 +86,7 @@ def __virtual__():
if get_configured_provider() is False:
return False
for provider, details in __opts__['providers'].iteritems():
for provider, details in six.iteritems(__opts__['providers']):
if 'provider' not in details or details['provider'] != 'aws':
continue