diff options
| author | Will Thames <will@thames.id.au> | 2019-03-19 00:40:28 +1000 |
|---|---|---|
| committer | Sloane Hertel <shertel@redhat.com> | 2019-03-18 09:40:28 -0500 |
| commit | 64943e2f9df062427d91c3fe43fc4262d96b5460 (patch) | |
| tree | 447883b9a28655a1564ac33b281b32ab62b46c07 | |
| parent | fc2ad0e9def9dfb2d2ea4b99d51d12aba2dd419a (diff) | |
| download | ansible-64943e2f9df062427d91c3fe43fc4262d96b5460.tar.gz | |
Fix _hashable_policy for python3 (#53953)
Convert policy to string before using `startswith(str)`
Fixes #53932
| -rw-r--r-- | lib/ansible/module_utils/ec2.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ansible/module_utils/ec2.py b/lib/ansible/module_utils/ec2.py index fc88063b31..d8d986dc90 100644 --- a/lib/ansible/module_utils/ec2.py +++ b/lib/ansible/module_utils/ec2.py @@ -561,10 +561,11 @@ def _hashable_policy(policy, policy_list): tupleified = tuple(tupleified) policy_list.append(tupleified) elif isinstance(policy, string_types) or isinstance(policy, binary_type): + policy = to_text(policy) # convert root account ARNs to just account IDs if policy.startswith('arn:aws:iam::') and policy.endswith(':root'): policy = policy.split(':')[4] - return [(to_text(policy))] + return [policy] elif isinstance(policy, dict): sorted_keys = list(policy.keys()) sorted_keys.sort() |