Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
flask-admin
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Python-Dev
flask-admin
Commits
53658d59
Commit
53658d59
authored
Dec 23, 2015
by
Arthur Bressan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Parses time using time module and removes dateutil dependency
parent
041d513f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
s3.py
flask_admin/contrib/fileadmin/s3.py
+7
-4
No files found.
flask_admin/contrib/fileadmin/s3.py
View file @
53658d59
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment