Skip to content

add standard file mode param, add content_encoding #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add standard file mode param, add content_encoding #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31a806e
add standard file mode param, add content_encoding
jfelectron Nov 23, 2014
381bd16
set default mode to read
jfelectron Nov 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions s3file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,21 @@ def s3open(*args, **kwargs):

class S3File(object):

def __init__(self, url, key=None, secret=None, expiration_days=0, private=False, content_type=None, create=True):
def __init__(self, url,mode='r', key=None, secret=None, expiration_days=0, private=False, content_type=None,content_encoding=None):
from boto.s3.connection import S3Connection
from boto.s3.key import Key

self.url = urlparse(url)
self.expiration_days = expiration_days
self.buffer = cStringIO.StringIO()

mode = mode if mode else 'r'
self.private = private
self.closed = False
self._readreq = True
self._writereq = False
self.content_type = content_type or mimetypes.guess_type(self.url.path)[0]
mime_type = mimetypes.guess_type(self.url.path)
self.content_type = content_type or mime_type[0]
self.content_encoding = content_encoding or mime_type[1]

bucket = self.url.netloc
if bucket.endswith('.s3.amazonaws.com'):
Expand All @@ -36,8 +38,11 @@ def __init__(self, url, key=None, secret=None, expiration_days=0, private=False,

self.name = "s3://" + bucket + self.url.path

if create:
self.bucket = self.client.create_bucket(bucket)
if mode =='w':
try:
self.bucket = self.client.create_bucket(bucket)
except:
self.bucket = self.client.get_bucket(bucket, validate=False)
else:
self.bucket = self.client.get_bucket(bucket, validate=False)

Expand Down Expand Up @@ -74,6 +79,8 @@ def _remote_write(self):

if self.content_type:
headers["Content-Type"] = self.content_type
if self.content_encoding:
headers["Content-Type"] = self.content_encoding

if self.expiration_days:
now = datetime.datetime.utcnow()
Expand Down Expand Up @@ -136,4 +143,4 @@ def write(self, s):

def writelines(self, sequence):
self._writereq = True
self.buffer.writelines(sequence)
self.buffer.writelines(sequence)