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:26 -0800
commitedcbc2410ab6b90b79f809fc91d4d9ea7f57bb2b (patch)
tree77159df0000eb8b7a6d5e0498c1d506d81d117bc
parent30b5b3accb093ea9ce1da3c6a0ca15eaa24c9304 (diff)
downloadansible-modules-core-edcbc2410ab6b90b79f809fc91d4d9ea7f57bb2b.tar.gz
use 'six' for urlparse compatability (#5777)
* use 'six' for urlparse compatability
-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 bfb4627f..fad1d6d6 100755
--- a/cloud/amazon/s3.py
+++ b/cloud/amazon/s3.py
@@ -248,7 +248,7 @@ EXAMPLES = '''
'''
import os
-import urlparse
+from ansible.module_utils.six.moves.urllib.parse import urlparse
from ssl import SSLError
try: