cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Moving the import to the top of the file and getting rid of the redundancy

Browse source 
I sure do wish I knew where the whitespace change was coming from, though. Frustrating.
This commit is contained in:
Michael Laccetti 2015-03-02 20:12:54 -05:00 committed by Matt Clay
parent 0bd25a9a38
commit 8efb138fdc
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/modules/cloud/amazon/s3.py
View file

@ -125,6 +125,8 @@ import os
import urlparse import urlparse
import hashlib import hashlib
from boto.s3.connection import OrdinaryCallingFormat
try: try:
import boto import boto
from boto.s3.connection import Location from boto.s3.connection import Location
@ -321,7 +323,6 @@ def main():
if is_fakes3(s3_url): if is_fakes3(s3_url):
try: try:
fakes3 = urlparse.urlparse(s3_url) fakes3 = urlparse.urlparse(s3_url)
from boto.s3.connection import OrdinaryCallingFormat
s3 = boto.connect_s3( s3 = boto.connect_s3(
aws_access_key, aws_access_key,
aws_secret_key, aws_secret_key,
@ -339,21 +340,20 @@ def main():
module.fail_json(msg = str(e)) module.fail_json(msg = str(e))
else: else:
try: try:
from boto.s3.connection import OrdinaryCallingFormat
s3 = boto.s3.connect_to_region(location, aws_access_key_id=aws_access_key, aws_secret_access_key=aws_secret_key, is_secure=True, calling_format=OrdinaryCallingFormat()) s3 = boto.s3.connect_to_region(location, aws_access_key_id=aws_access_key, aws_secret_access_key=aws_secret_key, is_secure=True, calling_format=OrdinaryCallingFormat())
except boto.exception.NoAuthHandlerFound, e: except boto.exception.NoAuthHandlerFound, e:
module.fail_json(msg = str(e)) module.fail_json(msg = str(e))
# If our mode is a GET operation (download), go through the procedure as appropriate ... # If our mode is a GET operation (download), go through the procedure as appropriate ...
if mode == 'get': if mode == 'get':
# First, we check to see if the bucket exists, we get "bucket" returned. # First, we check to see if the bucket exists, we get "bucket" returned.
bucketrtn = bucket_check(module, s3, bucket) bucketrtn = bucket_check(module, s3, bucket)
if bucketrtn is False: if bucketrtn is False:
module.fail_json(msg="Target bucket cannot be found", failed=True) module.fail_json(msg="Target bucket cannot be found", failed=True)
# Next, we check to see if the key in the bucket exists. If it exists, it also returns key_matches md5sum check. # Next, we check to see if the key in the bucket exists. If it exists, it also returns key_matches md5sum check.
keyrtn = key_check(module, s3, bucket, obj) keyrtn = key_check(module, s3, bucket, obj)
if keyrtn is False: if keyrtn is False:
module.fail_json(msg="Target key cannot be found", failed=True) module.fail_json(msg="Target key cannot be found", failed=True)