From 0e9991e9bd5748a6d32c825e0a00a5ac15c29982 Mon Sep 17 00:00:00 2001 From: Pepper Date: Sat, 26 Sep 2015 22:00:15 -0400 Subject: linting... --- lib/s3cli.py | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'lib/s3cli.py') diff --git a/lib/s3cli.py b/lib/s3cli.py index 70ba24c..6620bf1 100644 --- a/lib/s3cli.py +++ b/lib/s3cli.py @@ -1,24 +1,25 @@ -from config import * +"""All s3 related methods stored here""" +from config import AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, BUCKET_NAME import sys from boto.s3.connection import S3Connection from boto.s3.key import Key class S3Cli(object): - def __init__(self): - try: - self.conn = S3Connection(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, is_secure=False) - self.bucket = self.conn.get_bucket(BUCKET_NAME) - except Exception as e: - sys.stderr.write("Could not connect to s3\n"); - sys.stderr.write(str(e)) - sys.exit(1) + def __init__(self): + try: + self.conn = S3Connection(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, is_secure=False) + self.bucket = self.conn.get_bucket(BUCKET_NAME) + except Exception as e: + sys.stderr.write("Could not connect to s3\n") + sys.stderr.write(str(e)) + sys.exit(1) - def s3move(self, filename,objectname): - try: - k = Key(self.bucket) - k.key = objectname - k.set_contents_from_filename(filename) - k.set_acl('public-read') - k.storage_class = 'REDUCED_REDUNDANCY' - except Exception as e: - sys.stderr.write(str(e)); - sys.exit(1) + def s3move(self, filename, objectname): + try: + k = Key(self.bucket) + k.key = objectname + k.set_contents_from_filename(filename) + k.set_acl('public-read') + k.storage_class = 'REDUCED_REDUNDANCY' + except Exception as e: + sys.stderr.write(str(e)) + sys.exit(1) -- cgit v1.2.3-70-g09d2