diff options
| -rw-r--r-- | compass-deck/api/__init__.py | 2 | ||||
| -rw-r--r-- | compass-deck/api/api.py | 8 | ||||
| -rw-r--r-- | compass-deck/api/v1/api.py | 2 | ||||
| -rwxr-xr-x | compass-deck/bin/manage_db.py | 2 | ||||
| -rw-r--r-- | compass-deck/db/api/user.py | 2 | ||||
| -rw-r--r-- | compass-deck/db/v1/model.py | 2 | ||||
| -rw-r--r-- | compass-tasks-base/db/api/user.py | 2 | ||||
| -rw-r--r-- | compass-tasks-base/db/v1/model.py | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/compass-deck/api/__init__.py b/compass-deck/api/__init__.py index 784fe23..e2d2544 100644 --- a/compass-deck/api/__init__.py +++ b/compass-deck/api/__init__.py @@ -14,7 +14,7 @@ import datetime from flask import Blueprint -from flask.ext.login import LoginManager +from flask_login import LoginManager from flask import Flask # from compass.api.v1.api import v1_app diff --git a/compass-deck/api/api.py b/compass-deck/api/api.py index e1cdd39..1fa10f2 100644 --- a/compass-deck/api/api.py +++ b/compass-deck/api/api.py @@ -22,10 +22,10 @@ import netaddr import requests import simplejson as json -from flask.ext.login import current_user -from flask.ext.login import login_required -from flask.ext.login import login_user -from flask.ext.login import logout_user +from flask_login import current_user +from flask_login import login_required +from flask_login import login_user +from flask_login import logout_user from flask import request from compass.api import app diff --git a/compass-deck/api/v1/api.py b/compass-deck/api/v1/api.py index 9dbc548..345746a 100644 --- a/compass-deck/api/v1/api.py +++ b/compass-deck/api/v1/api.py @@ -19,7 +19,7 @@ import simplejson as json from flask import Blueprint from flask import request -from flask.ext.restful import Resource +from flask_restful import Resource from compass.api.exception import BadRequest from compass.api.exception import Forbidden diff --git a/compass-deck/bin/manage_db.py b/compass-deck/bin/manage_db.py index 3e56433..38bbc43 100755 --- a/compass-deck/bin/manage_db.py +++ b/compass-deck/bin/manage_db.py @@ -26,7 +26,7 @@ sys.path.append(current_dir) import switch_virtualenv -from flask.ext.script import Manager +from flask_script import Manager from compass.api import app from compass.db.api import database diff --git a/compass-deck/db/api/user.py b/compass-deck/db/api/user.py index db039eb..0105797 100644 --- a/compass-deck/db/api/user.py +++ b/compass-deck/db/api/user.py @@ -18,7 +18,7 @@ import functools import logging import re -from flask.ext.login import UserMixin +from flask_login import UserMixin from compass.db.api import database from compass.db.api import utils diff --git a/compass-deck/db/v1/model.py b/compass-deck/db/v1/model.py index d74e355..f84557c 100644 --- a/compass-deck/db/v1/model.py +++ b/compass-deck/db/v1/model.py @@ -28,7 +28,7 @@ from sqlalchemy.ext.hybrid import hybrid_property from compass.utils import util -from flask.ext.login import UserMixin +from flask_login import UserMixin from itsdangerous import URLSafeTimedSerializer BASE = declarative_base() diff --git a/compass-tasks-base/db/api/user.py b/compass-tasks-base/db/api/user.py index db039eb..0105797 100644 --- a/compass-tasks-base/db/api/user.py +++ b/compass-tasks-base/db/api/user.py @@ -18,7 +18,7 @@ import functools import logging import re -from flask.ext.login import UserMixin +from flask_login import UserMixin from compass.db.api import database from compass.db.api import utils diff --git a/compass-tasks-base/db/v1/model.py b/compass-tasks-base/db/v1/model.py index d74e355..f84557c 100644 --- a/compass-tasks-base/db/v1/model.py +++ b/compass-tasks-base/db/v1/model.py @@ -28,7 +28,7 @@ from sqlalchemy.ext.hybrid import hybrid_property from compass.utils import util -from flask.ext.login import UserMixin +from flask_login import UserMixin from itsdangerous import URLSafeTimedSerializer BASE = declarative_base() |