| |
@@ -3,18 +3,15 @@
|
| |
import os
|
| |
|
| |
from flask import Flask, render_template
|
| |
- from flask_fas_openid import FAS
|
| |
from flask_sqlalchemy import SQLAlchemy
|
| |
|
| |
from . import config
|
| |
- from .util.login import FakeFas
|
| |
|
| |
# the version as used in setup.py and docs
|
| |
__version__ = "1.1.0"
|
| |
|
| |
# Flask App
|
| |
app = Flask(__name__)
|
| |
- fas = None
|
| |
# Is this an OpenShift deployment?
|
| |
openshift = os.getenv('OPENSHIFT_PROD')
|
| |
|
| |
@@ -30,15 +27,12 @@
|
| |
if os.getenv('DEV') == 'true':
|
| |
app.logger.debug('Using development config')
|
| |
app.config.from_object('blockerbugs.config.DevelopmentConfig')
|
| |
- fas = FakeFas(app)
|
| |
elif os.getenv('TEST') == 'true' or openshift == "0":
|
| |
app.logger.debug('Using testing config')
|
| |
app.config.from_object('blockerbugs.config.TestingConfig')
|
| |
- fas = FAS(app)
|
| |
else:
|
| |
app.logger.debug('Using production config')
|
| |
app.config.from_object('blockerbugs.config.ProductionConfig')
|
| |
- fas = FAS(app)
|
| |
if openshift:
|
| |
app.logger.debug('Using openshift config')
|
| |
config.openshift_config(app.config, openshift)
|
| |
It's good to avoid unnecessary code in
__init__.py
. FAS can be loaded onlywhen it's needed. Thanks to this, developers can finally avoid specifying
DEV=true
before every command (if they modify theirsettings.py
accordingly),because FAS instance is now loaded based on config values and not envvars.
This depends on #169.