From 5f0e7752be68f6d8adf4a62297e8e834d27b76b7 Mon Sep 17 00:00:00 2001 From: SunDwarf Date: Tue, 29 Sep 2015 17:09:26 +0100 Subject: [PATCH] Fix unicode bug, again? Revert "Python2 is dumb." This reverts commit d8ab184531b650a416066987d552f67902ff7382. --- flask_s3.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/flask_s3.py b/flask_s3.py index 79e6282..5c366d0 100644 --- a/flask_s3.py +++ b/flask_s3.py @@ -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,