diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2016-01-24 18:50:49 +0100 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2016-02-02 04:22:16 +0100 |
commit | 753c03b3477071279299ca47ce76f5fcd346d5bd (patch) | |
tree | 7daae32c3aae94599f931c0a22eb9084af89483d /accounts/__init__.py | |
parent | ff2536dcdd308750bbc14242a27f555211c00a78 (diff) | |
download | web-753c03b3477071279299ca47ce76f5fcd346d5bd.tar.gz web-753c03b3477071279299ca47ce76f5fcd346d5bd.tar.bz2 web-753c03b3477071279299ca47ce76f5fcd346d5bd.zip |
Simplify configuration loading
Diffstat (limited to 'accounts/__init__.py')
-rw-r--r-- | accounts/__init__.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/accounts/__init__.py b/accounts/__init__.py index e641e80..b11a143 100644 --- a/accounts/__init__.py +++ b/accounts/__init__.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import account -import os from flask import Flask, g, session from utils import * @@ -13,8 +12,7 @@ app = Flask(__name__) app.register_blueprint(default.bp) app.register_blueprint(admin.bp, url_prefix='/admin') app.config.from_object('accounts.default_settings') -if 'SPLINE_ACCOUNT_WEB_SETTINGS' in os.environ: - app.config.from_envvar('SPLINE_ACCOUNT_WEB_SETTINGS') +app.config.from_envvar('SPLINE_ACCOUNT_WEB_SETTINGS', silent=True) app.session_interface = EncryptedSessionInterface() app.all_services = account.SERVICES #TODO: take that from our json file or so |