Add a default for S3_URL_STYLE

This commit is contained in:
Joe Friedl
2014-02-10 13:29:57 -05:00
parent 1cbaa942d0
commit c2c002ff2d
2 changed files with 4 additions and 2 deletions
+2 -1
View File
@@ -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)
+2 -1
View File
@@ -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)