From 1b6beb0fc8ef768bf574a8db7ecde919eaec24d2 Mon Sep 17 00:00:00 2001 From: "bool.dev" Date: Sat, 21 Nov 2015 16:04:42 +0530 Subject: [PATCH 1/2] Fixed MIMETIME instead of MIMETYPE typo. --- flask_s3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask_s3.py b/flask_s3.py index 5fee381..6f79530 100644 --- a/flask_s3.py +++ b/flask_s3.py @@ -401,7 +401,7 @@ def _test_deprecation(app, config): elif key == "S3_FILEPATH_HEADERS": config["FLASKS3_FILEPATH_HEADERS"] = config["S3_FILEPATH_HEADERS"]; warn.append(key) elif key == "S3_ONLY_MODIFIED": app.config["FLASKS3_ONLY_MODIFIED"] = config["S3_ONLY_MODIFIED"]; warn.append(key) elif key == "S3_GZIP": app.config["FLASKS3_GZIP"] = config["S3_GZIP"]; warn.append(key) - elif key == "S3_FORCE_MIMETYPE": app.config["FLASKS3_FORCE_MIMETYPE"] = config["S3_FORCE_MIMETIME"]; warn.append(key) + elif key == "S3_FORCE_MIMETYPE": app.config["FLASKS3_FORCE_MIMETYPE"] = config["S3_FORCE_MIMETYPE"]; warn.append(key) if warn: warnings.warn("Using old S3_ configs is deprecated, and will be removed in 0.3.0. Keys: {}".format(",".join(warn)), From b433e5d436407f9277a438c47451257aaa8ad3bb Mon Sep 17 00:00:00 2001 From: "bool.dev" Date: Sat, 21 Nov 2015 16:09:54 +0530 Subject: [PATCH 2/2] =?UTF-8?q?Changed=20deprecation=20testing,=20to=20do?= =?UTF-8?q?=20it=20without=20looping=20and=20deep=20copying.=20This=20avoi?= =?UTF-8?q?ds=20=E2=80=9CTypeError=E2=80=9D=20due=20to=20unexpected=20type?= =?UTF-8?q?s=20in=20configs,=20i.e=20modules/objects.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flask_s3.py | 53 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/flask_s3.py b/flask_s3.py index 6f79530..6b20beb 100644 --- a/flask_s3.py +++ b/flask_s3.py @@ -6,7 +6,6 @@ import re import gzip import warnings -import copy try: @@ -387,21 +386,43 @@ def _test_deprecation(app, config): Tests deprecation of old-style config headers. """ warn = [] - config = copy.deepcopy(config) - for key in config: - # Ugly thing here: - if key == "S3_BUCKET_DOMAIN": app.config["FLASKS3_BUCKET_DOMAIN"] = config["S3_BUCKET_DOMAIN"];warn.append(key) - elif key == "S3_CDN_DOMAIN": app.config["FLASKS3_CDN_DOMAIN"] = config["FLASKS3_CDN_DOMAIN"]; warn.append(key) - elif key == "S3_BUCKET_NAME": app.config["FLASKS3_BUCKET_NAME"] = config["S3_BUCKET_NAME"]; warn.append(key) - elif key == "S3_URL_STYLE": app.config["FLASKS3_URL_STYLE"] = config["S3_URL_STYLE"]; warn.append(key) - elif key == "S3_USE_HTTPS": app.config["FLASKS3_USE_HTTPS"] = config["S3_USE_HTTPS"]; warn.append(key) - elif key == "USE_S3": app.config["FLASKS3_ACTIVE"] = config["USE_S3"]; warn.append(key) - elif key == "USE_S3_DEBUG": app.config["FLASKS3_DEBUG"] = config["USE_S3_DEBUG"]; warn.append(key) - elif key == "S3_HEADERS": app.config["FLASKS3_HEADERS"] = config["S3_HEADERS"]; warn.append(key) - elif key == "S3_FILEPATH_HEADERS": config["FLASKS3_FILEPATH_HEADERS"] = config["S3_FILEPATH_HEADERS"]; warn.append(key) - elif key == "S3_ONLY_MODIFIED": app.config["FLASKS3_ONLY_MODIFIED"] = config["S3_ONLY_MODIFIED"]; warn.append(key) - elif key == "S3_GZIP": app.config["FLASKS3_GZIP"] = config["S3_GZIP"]; warn.append(key) - elif key == "S3_FORCE_MIMETYPE": app.config["FLASKS3_FORCE_MIMETYPE"] = config["S3_FORCE_MIMETYPE"]; warn.append(key) + # Ugly thing here: + if "S3_BUCKET_DOMAIN" in config: + app.config["FLASKS3_BUCKET_DOMAIN"] = config["S3_BUCKET_DOMAIN"] + warn.append("S3_BUCKET_DOMAIN") + if "S3_CDN_DOMAIN" in config: + app.config["FLASKS3_CDN_DOMAIN"] = config["FLASKS3_CDN_DOMAIN"] + warn.append("S3_CDN_DOMAIN") + if "S3_BUCKET_NAME" in config: + app.config["FLASKS3_BUCKET_NAME"] = config["S3_BUCKET_NAME"] + warn.append("S3_BUCKET_NAME") + if "S3_URL_STYLE" in config: + app.config["FLASKS3_URL_STYLE"] = config["S3_URL_STYLE"] + warn.append("S3_URL_STYLE") + if "S3_USE_HTTPS" in config: + app.config["FLASKS3_USE_HTTPS"] = config["S3_USE_HTTPS"] + warn.append("S3_USE_HTTPS") + if "USE_S3" in config: + app.config["FLASKS3_ACTIVE"] = config["USE_S3"] + warn.append("USE_S3") + if "USE_S3_DEBUG" in config: + app.config["FLASKS3_DEBUG"] = config["USE_S3_DEBUG"] + warn.append("USE_S3_DEBUG") + if "S3_HEADERS" in config: + app.config["FLASKS3_HEADERS"] = config["S3_HEADERS"] + warn.append("S3_HEADERS") + if "S3_FILEPATH_HEADERS" in config: + config["FLASKS3_FILEPATH_HEADERS"] = config["S3_FILEPATH_HEADERS"] + warn.append("S3_FILEPATH_HEADERS") + if "S3_ONLY_MODIFIED" in config: + app.config["FLASKS3_ONLY_MODIFIED"] = config["S3_ONLY_MODIFIED"] + warn.append("S3_ONLY_MODIFIED") + if "S3_GZIP" in config: + app.config["FLASKS3_GZIP"] = config["S3_GZIP"] + warn.append("S3_GZIP") + if "S3_FORCE_MIMETYPE" in config: + app.config["FLASKS3_FORCE_MIMETYPE"] = config["S3_FORCE_MIMETYPE"] + warn.append("S3_FORCE_MIMETYPE") if warn: warnings.warn("Using old S3_ configs is deprecated, and will be removed in 0.3.0. Keys: {}".format(",".join(warn)),