Commit 53658d59 authored by Arthur Bressan's avatar Arthur Bressan

Parses time using time module and removes dateutil dependency

parent 041d513f
import time
try: try:
from boto import s3 from boto import s3
from boto.s3.prefix import Prefix from boto.s3.prefix import Prefix
...@@ -5,8 +7,6 @@ try: ...@@ -5,8 +7,6 @@ try:
except ImportError: except ImportError:
s3 = None s3 = None
import dateutil.parser
from flask import redirect from flask import redirect
from flask_admin.babel import gettext from flask_admin.babel import gettext
...@@ -69,6 +69,10 @@ class S3Storage(object): ...@@ -69,6 +69,10 @@ class S3Storage(object):
def _remove_trailing_slash(name): def _remove_trailing_slash(name):
return name[:-1] return name[:-1]
def _iso_to_epoch(timestamp):
dt = time.strptime(timestamp.split(".")[0], "%Y-%m-%dT%H:%M:%S")
return int(time.mktime(dt))
files = [] files = []
directories = [] directories = []
if path and not path.endswith(self.separator): if path and not path.endswith(self.separator):
...@@ -81,8 +85,7 @@ class S3Storage(object): ...@@ -81,8 +85,7 @@ class S3Storage(object):
key_name = _remove_trailing_slash(key.name) key_name = _remove_trailing_slash(key.name)
directories.append((name, key_name, True, 0, 0)) directories.append((name, key_name, True, 0, 0))
else: else:
last_modified = int(dateutil.parser.parse(key.last_modified) last_modified = _iso_to_epoch(key.last_modified)
.strftime('%s'))
name = _strip_path(key.name, path) name = _strip_path(key.name, path)
files.append((name, key.name, False, key.size, last_modified)) files.append((name, key.name, False, key.size, last_modified))
return directories + files return directories + files
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment