summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2017-02-06 15:12:31 -0800
committerMatt Clay <matt@mystile.com>2017-02-06 15:12:31 -0800
commit97969fc587e16ca92c9444a57122ca61f85e60a6 (patch)
tree9eb4032e6ea0806aaf5cb682b95122434cacd999
parentd403c1cdcc8dffb46241df42a5bf2b7c8d50fc95 (diff)
downloadansible-modules-core-97969fc587e16ca92c9444a57122ca61f85e60a6.tar.gz
Revert "Revert "fix urlparse usage in cloud.amazon module to be compatible with python3""
This reverts commit d403c1cdcc8dffb46241df42a5bf2b7c8d50fc95.
-rw-r--r--cloud/amazon/_ec2_ami_search.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloud/amazon/_ec2_ami_search.py b/cloud/amazon/_ec2_ami_search.py
index 4e3189f5..0a9bed14 100644
--- a/cloud/amazon/_ec2_ami_search.py
+++ b/cloud/amazon/_ec2_ami_search.py
@@ -82,7 +82,7 @@ EXAMPLES = '''
import csv
import json
-import urlparse
+import ansible.module_utils.six.moves.urllib.parse as urlparse
SUPPORTED_DISTROS = ['ubuntu']