wassname/flask-s3
1
0
Fork 0
mirror of https://github.com/wassname/flask-s3.git synced 2026-06-27 15:50:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix unicode bug, again?

Browse Source 
Revert "Python2 is dumb."

This reverts commit d8ab184531.
This commit is contained in:
SunDwarf
2015-09-29 17:09:26 +01:00
parent a9bde93d2c
commit 5f0e7752be
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flask_s3.py
+1 -8
View File
@@ -130,14 +130,7 @@ def _static_folder_path(static_url, static_folder, static_asset):
(static_asset, static_folder))
rel_asset = static_asset[len(static_folder):]
# Now bolt the static url path and the relative asset location together
if six.PY2:
if not isinstance(static_url, unicode) or not isinstance(rel_asset, unicode):
u = six.u
else:
u = str
else:
u = str
return u('%s/%s' % (static_url.rstrip('/'), rel_asset.lstrip('/')))
return '%s/%s' % (static_url.rstrip('/'), rel_asset.lstrip('/'))
def _write_files(s3, app, static_url_loc, static_folder, files, bucket,