*: fix legacy imports

This change reorganizes imports and renames the legacy flask extensions.

endpoints/api/__init__.py

@@ -1,19 +1,19 @@
 import logging
 import datetime
 import json
-from enum import Enum
 
-from app import app, metric_queue
-from flask import Blueprint, Response, request, make_response, jsonify, session, url_for
-from flask.ext.restful import Resource, abort, Api, reqparse
-from flask.ext.restful.utils.cors import crossdomain
 from calendar import timegm
 from email.utils import formatdate
 from functools import partial, wraps
+
+from enum import Enum
+from flask import Blueprint, Response, request, make_response, jsonify, session, url_for
+from flask_restful import Resource, abort, Api, reqparse
+from flask_restful.utils.cors import crossdomain
 from jsonschema import validate, ValidationError
 
+from app import app, metric_queue
 from data import model
-from util.names import parse_namespace_repository
 from auth.permissions import (ReadRepositoryPermission, ModifyRepositoryPermission,
                               AdministerRepositoryPermission, UserReadPermission,
                               UserAdminPermission)
@@ -21,9 +21,11 @@ from auth import scopes
 from auth.auth_context import get_authenticated_user, get_validated_oauth_token
 from auth.auth import process_oauth
 from endpoints.csrf import csrf_protect
-from endpoints.exception import ApiException, Unauthorized, InvalidRequest, InvalidResponse, FreshLoginRequired
+from endpoints.exception import (ApiException, Unauthorized, InvalidRequest, InvalidResponse,
+                                 FreshLoginRequired)
 from endpoints.decorators import check_anon_protection
 from util.metrics.metricqueue import time_decorator
+from util.names import parse_namespace_repository
 from util.pagination import encrypt_page_token, decrypt_page_token
 
 logger = logging.getLogger(__name__)

endpoints/api/discovery.py

@@ -4,13 +4,15 @@ import re
 import logging
 import sys
 
-from flask.ext.restful import reqparse
+from collections import OrderedDict
+
+from flask_restful import reqparse
 
-from endpoints.api import (ApiResource, resource, method_metadata, nickname, truthy_bool,
-                           parse_args, query_param)
 from app import app
 from auth import scopes
-from collections import OrderedDict
+from endpoints.api import (ApiResource, resource, method_metadata, nickname, truthy_bool,
+                           parse_args, query_param)
+
 
 logger = logging.getLogger(__name__)
 

endpoints/api/user.py

@@ -4,13 +4,19 @@ import logging
 import json
 
 from flask import request, abort
-from flask.ext.login import logout_user
-from flask.ext.principal import identity_changed, AnonymousIdentity
+from flask_login import logout_user
+from flask_principal import identity_changed, AnonymousIdentity
 from peewee import IntegrityError
 
 import features
 
 from app import app, billing as stripe, authentication, avatar
+from auth import scopes
+from auth.auth_context import get_authenticated_user
+from auth.permissions import (AdministerOrganizationPermission, CreateRepositoryPermission,
+                              UserAdminPermission, UserReadPermission, SuperUserPermission)
+from data import model
+from data.billing import get_plan
 from data.database import Repository as RepositoryTable
 from endpoints.api import (ApiResource, nickname, resource, validate_json_request, request_error,
                            log_action, internal_only, require_user_admin, parse_args,
@@ -21,21 +27,17 @@ from endpoints.exception import NotFound, InvalidToken
 from endpoints.api.subscribe import subscribe
 from endpoints.common import common_login
 from endpoints.decorators import anon_allowed
-
-from data import model
-from data.billing import get_plan
-from auth.permissions import (AdministerOrganizationPermission, CreateRepositoryPermission,
-                              UserAdminPermission, UserReadPermission, SuperUserPermission)
-from auth.auth_context import get_authenticated_user
-from auth import scopes
 from util.useremails import (send_confirmation_email, send_recovery_email, send_change_email,
                              send_password_changed, send_org_recovery_email)
 from util.names import parse_single_urn
 
+
 REPOS_PER_PAGE = 100
 
+
 logger = logging.getLogger(__name__)
 
+
 def handle_invite_code(invite_code, user):
   """ Checks that the given invite code matches the specified user's e-mail address. If so, the
       user is marked as having a verified e-mail address and this method returns True.

endpoints/bitbuckettrigger.py

@@ -1,15 +1,15 @@
 import logging
 
 from flask import request, redirect, url_for, Blueprint
-from flask.ext.login import current_user
+from flask_login import current_user
 
+from app import app
+from auth.auth import require_session_login
 from buildtrigger.basehandler import BuildTriggerHandler
 from buildtrigger.bitbuckethandler import BitbucketBuildTrigger
-from endpoints.common import route_show_if
-from app import app
 from data import model
+from endpoints.common import route_show_if
 from util.http import abort
-from auth.auth import require_session_login
 
 import features
 
@@ -44,4 +44,4 @@ def attach_bitbucket_build_trigger(trigger_uuid):
                          trigger.uuid)
 
   logger.debug('Redirecting to full url: %s', full_url)
-  return redirect(full_url)
+  return redirect(full_url)

endpoints/common.py

@@ -10,20 +10,21 @@ from functools import wraps
 
 from cachetools import lru_cache
 from flask import make_response, render_template, request, abort, session
-from flask.ext.login import login_user
-from flask.ext.principal import identity_changed
-
-from app import app, oauth_apps, LoginWrappedDBUser
-from auth.permissions import QuayDeferredPermissionUser
-from auth import scopes
-from config import frontend_visible_config
-from external_libraries import get_external_javascript, get_external_css
-from util.secscan import PRIORITY_LEVELS
-from util.names import parse_namespace_repository
+from flask_login import login_user
+from flask_principal import identity_changed
 
 import endpoints.decorated # Register the various exceptions via decorators.
 import features
 
+from app import app, oauth_apps, LoginWrappedDBUser
+from auth import scopes
+from auth.permissions import QuayDeferredPermissionUser
+from config import frontend_visible_config
+from external_libraries import get_external_javascript, get_external_css
+from util.names import parse_namespace_repository
+from util.secscan import PRIORITY_LEVELS
+
+
 logger = logging.getLogger(__name__)
 
 route_data = None
@@ -31,6 +32,7 @@ route_data = None
 CACHE_BUSTERS_JSON = 'static/dist/cachebusters.json'
 CACHE_BUSTERS = None
 
+
 def get_cache_busters():
   """ Retrieves the cache busters hashes. """
   global CACHE_BUSTERS

endpoints/decorated.py

@@ -1,15 +1,17 @@
 import logging
-import json
 
 from flask import make_response, jsonify
+from flask_restful.utils.cors import crossdomain
+
 from app import app
-from util.useremails import CannotSendEmailException
-from util.config.provider.baseprovider import CannotWriteConfigException
-from flask.ext.restful.utils.cors import crossdomain
 from data import model
+from util.config.provider.baseprovider import CannotWriteConfigException
+from util.useremails import CannotSendEmailException
+
 
 logger = logging.getLogger(__name__)
 
+
 @app.errorhandler(model.DataModelException)
 def handle_dme(ex):
   logger.exception(ex)

endpoints/githubtrigger.py

@@ -1,7 +1,7 @@
 import logging
 
 from flask import request, redirect, url_for, Blueprint
-from flask.ext.login import current_user
+from flask_login import current_user
 
 import features
 

endpoints/gitlabtrigger.py

@@ -1,7 +1,9 @@
 import logging
 
 from flask import Blueprint, request, redirect, url_for
-from flask.ext.login import current_user
+from flask_login import current_user
+
+import features
 
 from app import app, gitlab_trigger
 from auth.auth import require_session_login
@@ -10,13 +12,12 @@ from data import model
 from endpoints.common import route_show_if
 from util.http import abort
 
-import features
-
 
 logger = logging.getLogger(__name__)
 client = app.config['HTTPCLIENT']
 gitlabtrigger = Blueprint('gitlab', __name__)
 
+
 @gitlabtrigger.route('/gitlab/callback/trigger', methods=['GET'])
 @route_show_if(features.GITLAB_BUILD)
 @require_session_login

endpoints/notificationmethod.py

@@ -1,22 +1,28 @@
 import logging
 import json
-import requests
 import re
 
-from flask.ext.mail import Message
+import requests
+
+from flask_mail import Message
+
 from app import mail, app, OVERRIDE_CONFIG_DIRECTORY
 from data import model
 from util.config.validator import SSL_FILENAMES
 from workers.queueworker import JobException
 
+
 logger = logging.getLogger(__name__)
 
+
 class InvalidNotificationMethodException(Exception):
   pass
 
+
 class CannotValidateNotificationMethodException(Exception):
   pass
 
+
 class NotificationMethodPerformException(JobException):
   pass
 
@@ -26,6 +32,7 @@ if app.config['PREFERRED_URL_SCHEME'] == 'https':
   # TODO(jschorr): move this into the config provider library
   SSLClientCert = [OVERRIDE_CONFIG_DIRECTORY + f for f in SSL_FILENAMES]
 
+
 class NotificationMethod(object):
   def __init__(self):
     pass

endpoints/oauthlogin.py

@@ -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

endpoints/realtime.py

@@ -2,13 +2,16 @@ import logging
 import json
 
 from flask import request, Blueprint, abort, Response
-from flask.ext.login import current_user
-from auth.auth import require_session_login
+from flask_login import current_user
+
 from app import userevents
+from auth.auth import require_session_login
 from data.userevent import CannotReadUserEventsException
 
+
 logger = logging.getLogger(__name__)
 
+
 realtime = Blueprint('realtime', __name__)
 
 

endpoints/web.py

@@ -1,13 +1,12 @@
 import json
 import logging
 
-from urlparse import urlparse
 from datetime import timedelta
 
 from cachetools import lru_cache
 from flask import (abort, redirect, request, url_for, make_response, Response, render_template,
-                   Blueprint, send_from_directory, jsonify, send_file)
-from flask.ext.login import current_user
+                   Blueprint, jsonify, send_file)
+from flask_login import current_user
 
 import features
 
@@ -38,7 +37,6 @@ from util.systemlogs import build_logs_archive
 from util.useremails import send_email_changed
 
 
-
 @lru_cache(maxsize=1)
 def _get_route_data():
   return swagger_route_data(include_internal=True, compact=True)