*: fix legacy imports

This change reorganizes imports and renames the legacy flask extensions.

test/registry_tests.py

@@ -1,49 +1,48 @@
-import unittest
-import requests
-import os
-import math
-import random
-import string
-import resumablehashlib
 import binascii
-import uuid
+import hashlib
+import json
+import logging
+import math
+import os
+import random
+import shutil
+import string
+import tarfile
 import time
-import gpgme
+import unittest
+import uuid
 
-import Crypto.Random
+from cStringIO import StringIO
+from tempfile import NamedTemporaryFile
+
+import bencode
+import gpgme
+import requests
+import resumablehashlib
+
+from Crypto import Random
+from Crypto.PublicKey import RSA
 from flask import request, jsonify
 from flask.blueprints import Blueprint
-from flask.ext.testing import LiveServerTestCase
+from flask_testing import LiveServerTestCase
+from jwkest.jwk import RSAKey
+
+import endpoints.decorated # required for side effect
 
 from app import app, storage, instance_keys
 from data.database import close_db_filter, configure, DerivedStorageForImage, QueueItem, Image
 from data import model
+from digest.checksums import compute_simple
+from endpoints.api import api_bp
+from endpoints.csrf import generate_csrf_token
 from endpoints.v1 import v1_bp
 from endpoints.v2 import v2_bp
 from endpoints.verbs import verbs
-from endpoints.api import api_bp
 from image.docker.schema1 import DockerSchema1ManifestBuilder
-
 from initdb import wipe_database, initialize_database, populate_database
-from endpoints.csrf import generate_csrf_token
-from tempfile import NamedTemporaryFile
 from jsonschema import validate as validate_schema
 from util.security.registry_jwt import decode_bearer_token
 
-import endpoints.decorated
-import json
-import hashlib
-import logging
-import bencode
-
-import tarfile
-import shutil
-
-from jwkest.jwk import RSAKey
-from Crypto.PublicKey import RSA
-
-from cStringIO import StringIO
-from digest.checksums import compute_simple
 
 try:
   app.register_blueprint(v1_bp, url_prefix='/v1')
@@ -119,7 +118,7 @@ def reload_app():
   configure(app.config)
 
   # Reload random after the process split, as it cannot be used uninitialized across forks.
-  Crypto.Random.atfork()
+  Random.atfork()
   return 'OK'
 
 app.register_blueprint(testbp, url_prefix='/__test')

test/test_auth.py

@@ -1,26 +1,27 @@
-import unittest
 import base64
+import unittest
+
 from datetime import datetime, timedelta
 
-from app import app
-from data import model
-from data.database import OAuthApplication, OAuthAccessToken
 from flask import g
-from flask.ext.principal import identity_loaded
+from flask_principal import identity_loaded
 
+from app import app
 from auth.auth import _process_basic_auth
 from auth.scopes import (scopes_from_scope_string, is_subset_string, DIRECT_LOGIN, ADMIN_REPO,
                          ALL_SCOPES)
 from auth.permissions import QuayDeferredPermissionUser
-from endpoints.api import api_bp, api
+from data import model
+from data.database import OAuthApplication, OAuthAccessToken
+from endpoints.api import api
 from endpoints.api.user import User, Signin
-
-import json as py_json
 from test.test_api_usage import ApiTestCase
 
+
 ADMIN_ACCESS_USER = 'devtable'
 DISABLED_USER = 'disabled'
 
+
 @identity_loaded.connect_via(app)
 def on_identity_loaded(sender, identity):
   g.identity = identity

test/test_external_jwt_authn.py

@@ -1,19 +1,24 @@
-import unittest
-import requests
-import jwt
 import base64
+import unittest
+
+from datetime import datetime, timedelta
+from tempfile import NamedTemporaryFile
+
+import jwt
+import requests
+
+from Crypto.PublicKey import RSA
+from flask import Flask, jsonify, request, make_response
+from flask_testing import LiveServerTestCase
 
 from app import app
-from flask import Flask, jsonify, request, make_response
-from flask.ext.testing import LiveServerTestCase
-from initdb import setup_database_for_testing, finished_database_for_testing
 from data.users import ExternalJWTAuthN
-from tempfile import NamedTemporaryFile
-from Crypto.PublicKey import RSA
-from datetime import datetime, timedelta
+from initdb import setup_database_for_testing, finished_database_for_testing
+
 
 _PORT_NUMBER = 5001
 
+
 class JWTAuthTestCase(LiveServerTestCase):
   maxDiff = None
 

test/test_keystone_auth.py

@@ -1,14 +1,18 @@
-import unittest
-import requests
-import os
 import json
+import os
+import unittest
+
+import requests
 
 from flask import Flask, request, abort
-from flask.ext.testing import LiveServerTestCase
+from flask_testing import LiveServerTestCase
+
 from data.users.keystone import KeystoneUsers
 
+
 _PORT_NUMBER = 5001
 
+
 class KeystoneAuthTests(LiveServerTestCase):
   maxDiff = None