*: fix legacy imports

This change reorganizes imports and renames the legacy flask extensions.
This commit is contained in:
Jimmy Zelinskie 2016-09-28 20:17:14 -04:00
parent 0d805905dc
commit fc7301be0d
23 changed files with 179 additions and 139 deletions

View file

@ -1,8 +1,9 @@
import logging
import requests
from flask import request, redirect, url_for, Blueprint
from flask.ext.login import current_user
from flask_login import current_user
from peewee import IntegrityError
import features
@ -20,6 +21,7 @@ logger = logging.getLogger(__name__)
client = app.config['HTTPCLIENT']
oauthlogin = Blueprint('oauthlogin', __name__)
def render_ologin_error(service_name,
error_message='Could not load user data. The token may have expired.'):
user_creation = features.USER_CREATION and features.DIRECT_LOGIN