Skip to content
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

Support alternate datetime format for S3 files #262

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

Support alternate datetime format for S3 files #262

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
885528c
Support alternate datetime format for S3 files
mattharrison Sep 19, 2016
e77785f
Support Py3
mattharrison Sep 20, 2016
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
20 changes: 5 additions & 15 deletions fs/s3fs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from __future__ import unicode_literals
"""
fs.s3fs
=======
Expand Down Expand Up @@ -113,8 +114,6 @@ def __init__(self, bucket, prefix="", aws_access_key=None, aws_secret_key=None,
prefix = prefix[1:]
if not prefix.endswith(separator) and prefix != "":
prefix = prefix + separator
if isinstance(prefix,unicode):
prefix = prefix.encode("utf8")
self._prefix = prefix
self._tlocal = thread_local()
super(S3FS, self).__init__(thread_synchronize=thread_synchronize)
Expand Down Expand Up @@ -180,8 +179,6 @@ def _s3path(self,path):
s3path = self._prefix + path
if s3path and s3path[-1] == self._separator:
s3path = s3path[:-1]
if isinstance(s3path,unicode):
s3path = s3path.encode("utf8")
return s3path

def _uns3path(self,s3path,roots3path=None):
Expand Down Expand Up @@ -399,8 +396,6 @@ def _iter_keys(self,path):
# Skip over the entry for the directory itself, if it exists
name = self._uns3path(k.name,s3path)
if name != "":
if not isinstance(name,unicode):
name = name.decode("utf8")
if name.endswith(self._separator):
name = name[:-1]
yield (name,k)
Expand Down Expand Up @@ -580,12 +575,13 @@ def _get_key_info(self,key,name=None):
info['size'] = int(key.size)
etag = getattr(key,"etag",None)
if etag is not None:
if isinstance(etag,unicode):
etag = etag.encode("utf8")
info['etag'] = etag.strip('"').strip("'")
if hasattr(key,"last_modified"):
# TODO: does S3 use any other formats?
fmt = "%a, %d %b %Y %H:%M:%S %Z"
if '-' in key.last_modified:
fmt = "%Y-%m-%dT%H:%M:%S.%fZ"
else:
fmt = "%a, %d %b %Y %H:%M:%S %Z"
try:
mtime = datetime.datetime.strptime(key.last_modified,fmt)
info['modified_time'] = mtime
Expand Down Expand Up @@ -664,8 +660,6 @@ def walkfiles(self,
for k in self._s3bukt.list(prefix=prefix):
name = relpath(self._uns3path(k.name,prefix))
if name != "":
if not isinstance(name,unicode):
name = name.decode("utf8")
if not k.name.endswith(self._separator):
if wildcard is not None:
if callable(wildcard):
Expand All @@ -692,8 +686,6 @@ def walkinfo(self,
for k in self._s3bukt.list(prefix=prefix):
name = relpath(self._uns3path(k.name,prefix))
if name != "":
if not isinstance(name,unicode):
name = name.decode("utf8")
if wildcard is not None:
if callable(wildcard):
if not wildcard(basename(name)):
Expand All @@ -719,8 +711,6 @@ def walkfilesinfo(self,
for k in self._s3bukt.list(prefix=prefix):
name = relpath(self._uns3path(k.name,prefix))
if name != "":
if not isinstance(name,unicode):
name = name.decode("utf8")
if not k.name.endswith(self._separator):
if wildcard is not None:
if callable(wildcard):
Expand Down