summaryrefslogtreecommitdiff
path: root/boto/iam
diff options
context:
space:
mode:
authorFelix Yan <felixonmars@gmail.com>2014-07-03 23:20:34 +0800
committerFelix Yan <felixonmars@gmail.com>2014-07-03 23:20:34 +0800
commit89128db815fb094669805eaaed60eec76f323234 (patch)
treeeb8ef5940d6143b0aa006256aefcf0e9a744e808 /boto/iam
parent1ac79d0c984bfd83f26e7c3af4877a731a63ecc2 (diff)
downloadboto-89128db815fb094669805eaaed60eec76f323234.tar.gz
iam module: add backward-compatible support for Python 3.3+
Diffstat (limited to 'boto/iam')
-rw-r--r--boto/iam/connection.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/boto/iam/connection.py b/boto/iam/connection.py
index bbb0afd9..bf8f78b0 100644
--- a/boto/iam/connection.py
+++ b/boto/iam/connection.py
@@ -21,7 +21,7 @@
# IN THE SOFTWARE.
import boto
import boto.jsonresponse
-from boto.compat import json
+from boto.compat import json, six
from boto.resultset import ResultSet
from boto.iam.summarymap import SummaryMap
from boto.connection import AWSQueryConnection
@@ -1104,7 +1104,7 @@ class IAMConnection(AWSQueryConnection):
def _build_policy(self, assume_role_policy_document=None):
if assume_role_policy_document is not None:
- if isinstance(assume_role_policy_document, basestring):
+ if isinstance(assume_role_policy_document, six.string_types):
# Historically, they had to pass a string. If it's a string,
# assume the user has already handled it.
return assume_role_policy_document