internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[s3_bucket] import urlparse (#42474)

Browse Source
This commit is contained in:
Sloane Hertel
2018-07-11 12:40:45 -04:00
committed by Ryan Brown
parent ccbac66128
commit 7086863c52
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ansible/modules/cloud/amazon/s3_bucket.py
View File

@@ -108,7 +108,7 @@ import json
import os
import time
import ansible.module_utils.six.moves.urllib.parse as urlparse
from ansible.module_utils.six.moves.urllib.parse import urlparse
from ansible.module_utils.six import string_types
from ansible.module_utils.basic import to_text
from ansible.module_utils.aws.core import AnsibleAWSModule
@@ -455,7 +455,7 @@ def destroy_bucket(s3_client, module):
def is_fakes3(s3_url):
""" Return True if s3_url has scheme fakes3:// """
if s3_url is not None:
return urlparse.urlparse(s3_url).scheme in ('fakes3', 'fakes3s')
return urlparse(s3_url).scheme in ('fakes3', 'fakes3s')
else:
return False
@@ -465,7 +465,7 @@ def is_walrus(s3_url):
We assume anything other than *.amazonaws.com is Walrus"""
if s3_url is not None:
o = urlparse.urlparse(s3_url)
o = urlparse(s3_url)
return not o.hostname.endswith('amazonaws.com')
else:
return False