*: fix legacy imports

This change reorganizes imports and renames the legacy flask extensions.

auth/auth.py

@@ -3,20 +3,21 @@ import logging
 from functools import wraps
 from uuid import UUID
 from datetime import datetime
-from flask import request, session
-from flask.ext.principal import identity_changed, Identity
-from flask.ext.login import current_user
-from flask.sessions import SecureCookieSessionInterface, BadSignature
 from base64 import b64decode
 
+from flask import request, session
+from flask.sessions import SecureCookieSessionInterface, BadSignature
+from flask_login import current_user
+from flask_principal import identity_changed, Identity
+
 import scopes
 
-from data import model
 from app import app, authentication
-from endpoints.exception import InvalidToken, ExpiredToken
-from permissions import QuayDeferredPermissionUser
 from auth_context import (set_authenticated_user, set_validated_token, set_grant_context,
                           set_validated_oauth_token)
+from data import model
+from endpoints.exception import InvalidToken, ExpiredToken
+from permissions import QuayDeferredPermissionUser
 from util.http import abort
 
 

auth/permissions.py

@@ -1,13 +1,14 @@
 import logging
 
-from flask.ext.principal import identity_loaded, Permission, Identity, identity_changed
 from collections import namedtuple, defaultdict
 from functools import partial
 
-import scopes
+from flask_principal import identity_loaded, Permission, Identity, identity_changed
+
 
-from data import model
 from app import app, superusers
+from auth import scopes
+from data import model
 
 
 logger = logging.getLogger(__name__)

auth/registry_jwt_auth.py

@@ -4,7 +4,7 @@ from functools import wraps
 
 from jsonschema import validate, ValidationError
 from flask import request, url_for
-from flask.ext.principal import identity_changed, Identity
+from flask_principal import identity_changed, Identity
 
 from app import app, get_app_url, instance_keys
 from .auth_context import set_grant_context, get_grant_context