From c2c002ff2dc80c75eb658ed1bee06d8ca1952361 Mon Sep 17 00:00:00 2001 From: Joe Friedl Date: Mon, 10 Feb 2014 13:29:57 -0500 Subject: [PATCH] Add a default for S3_URL_STYLE --- flask_s3.py | 3 ++- tests/test_flask_static.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/flask_s3.py b/flask_s3.py index 20637bc..fec208b 100644 --- a/flask_s3.py +++ b/flask_s3.py @@ -220,7 +220,8 @@ class FlaskS3(object): ('S3_BUCKET_DOMAIN', 's3.amazonaws.com'), ('S3_CDN_DOMAIN', ''), ('S3_USE_CACHE_CONTROL', False), - ('S3_HEADERS', {})] + ('S3_HEADERS', {}), + ('S3_URL_STYLE', 'host')] for k, v in defaults: app.config.setdefault(k, v) diff --git a/tests/test_flask_static.py b/tests/test_flask_static.py index b1831db..d4ba9f1 100644 --- a/tests/test_flask_static.py +++ b/tests/test_flask_static.py @@ -30,7 +30,8 @@ class FlaskStaticTest(unittest.TestCase): FlaskS3(self.app) defaults = ('S3_USE_HTTPS', 'USE_S3', 'USE_S3_DEBUG', 'S3_BUCKET_DOMAIN', 'S3_CDN_DOMAIN', - 'S3_USE_CACHE_CONTROL', 'S3_HEADERS') + 'S3_USE_CACHE_CONTROL', 'S3_HEADERS', + 'S3_URL_STYLE') for default in defaults: self.assertIn(default, self.app.config)