summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Timmons <ted@perljam.net>2016-12-01 10:30:26 -0800
committerToshio Kuratomi <a.badger@gmail.com>2016-12-01 10:30:55 -0800
commita9b2e4e5c1e522febb06f4565e487b774dcab8a1 (patch)
treed9b00b500f502a173cc359125ed997535703badf
parentd6961eb4eae1dde122ec1fd8103f85d845323acb (diff)
downloadansible-modules-core-a9b2e4e5c1e522febb06f4565e487b774dcab8a1.tar.gz
use 'six' for urlparse compatability (#5777)
* use 'six' for urlparse compatability (cherry picked from commit edcbc2410ab6b90b79f809fc91d4d9ea7f57bb2b)
-rwxr-xr-xcloud/amazon/s3.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloud/amazon/s3.py b/cloud/amazon/s3.py
index bb3d0145..5f6dc7b7 100755
--- a/cloud/amazon/s3.py
+++ b/cloud/amazon/s3.py
@@ -195,7 +195,7 @@ EXAMPLES = '''
'''
import os
-import urlparse
+from ansible.module_utils.six.moves.urllib.parse import urlparse
from ssl import SSLError
try: