From 8e5323e2d769f4a04e987f89d9482144307f8a37 Mon Sep 17 00:00:00 2001 From: kevgliss Date: Tue, 22 Nov 2016 21:11:20 -0800 Subject: [PATCH] migrating flask imports (#525) --- lemur/auth/permissions.py | 2 +- lemur/auth/service.py | 6 +++--- lemur/auth/views.py | 4 ++-- lemur/authorities/views.py | 2 +- lemur/certificates/views.py | 2 +- lemur/common/utils.py | 2 +- lemur/defaults/views.py | 2 +- lemur/destinations/views.py | 2 +- lemur/domains/views.py | 2 +- lemur/endpoints/views.py | 2 +- lemur/logs/views.py | 2 +- lemur/manage.py | 4 ++-- lemur/migrations/versions/7f71c0cea31a_.py | 2 +- lemur/notifications/views.py | 2 +- lemur/plugins/views.py | 2 +- lemur/roles/views.py | 2 +- lemur/sources/views.py | 2 +- lemur/tests/conftest.py | 2 +- lemur/users/views.py | 2 +- 19 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lemur/auth/permissions.py b/lemur/auth/permissions.py index 36fc87e1..9e65d506 100644 --- a/lemur/auth/permissions.py +++ b/lemur/auth/permissions.py @@ -9,7 +9,7 @@ from functools import partial from collections import namedtuple -from flask.ext.principal import Permission, RoleNeed +from flask_principal import Permission, RoleNeed # Permissions operator_permission = Permission(RoleNeed('operator')) diff --git a/lemur/auth/service.py b/lemur/auth/service.py index 00778dbf..fc6a7af1 100644 --- a/lemur/auth/service.py +++ b/lemur/auth/service.py @@ -17,10 +17,10 @@ from datetime import datetime, timedelta from flask import g, current_app, jsonify, request -from flask.ext.restful import Resource -from flask.ext.principal import identity_loaded, RoleNeed, UserNeed +from flask_restful import Resource +from flask_principal import identity_loaded, RoleNeed, UserNeed -from flask.ext.principal import Identity, identity_changed +from flask_principal import Identity, identity_changed from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives import serialization diff --git a/lemur/auth/views.py b/lemur/auth/views.py index 655b1e12..5c2d3358 100644 --- a/lemur/auth/views.py +++ b/lemur/auth/views.py @@ -11,8 +11,8 @@ import requests from flask import Blueprint, current_app -from flask.ext.restful import reqparse, Resource, Api -from flask.ext.principal import Identity, identity_changed +from flask_restful import reqparse, Resource, Api +from flask_principal import Identity, identity_changed from lemur.extensions import metrics from lemur.common.utils import get_psuedo_random_string diff --git a/lemur/authorities/views.py b/lemur/authorities/views.py index ab03dd66..fe6b5523 100644 --- a/lemur/authorities/views.py +++ b/lemur/authorities/views.py @@ -6,7 +6,7 @@ .. moduleauthor:: Kevin Glisson """ from flask import Blueprint, g -from flask.ext.restful import reqparse, Api +from flask_restful import reqparse, Api from lemur.common.utils import paginated_parser from lemur.common.schema import validate_schema diff --git a/lemur/certificates/views.py b/lemur/certificates/views.py index 89038718..eb8d281e 100644 --- a/lemur/certificates/views.py +++ b/lemur/certificates/views.py @@ -9,7 +9,7 @@ import base64 from builtins import str from flask import Blueprint, make_response, jsonify, g -from flask.ext.restful import reqparse, Api +from flask_restful import reqparse, Api from lemur.common.schema import validate_schema from lemur.common.utils import paginated_parser diff --git a/lemur/common/utils.py b/lemur/common/utils.py index 507dcda2..2e94c1a8 100644 --- a/lemur/common/utils.py +++ b/lemur/common/utils.py @@ -12,7 +12,7 @@ import random from cryptography import x509 from cryptography.hazmat.backends import default_backend -from flask.ext.restful.reqparse import RequestParser +from flask_restful.reqparse import RequestParser paginated_parser = RequestParser() diff --git a/lemur/defaults/views.py b/lemur/defaults/views.py index 8452eb7a..f06d565d 100644 --- a/lemur/defaults/views.py +++ b/lemur/defaults/views.py @@ -4,7 +4,7 @@ :license: Apache, see LICENSE for more details. """ from flask import current_app, Blueprint -from flask.ext.restful import Api +from flask_restful import Api from lemur.auth.service import AuthenticatedResource diff --git a/lemur/destinations/views.py b/lemur/destinations/views.py index 7c324b05..0437f3dc 100644 --- a/lemur/destinations/views.py +++ b/lemur/destinations/views.py @@ -7,7 +7,7 @@ .. moduleauthor:: Kevin Glisson """ from flask import Blueprint -from flask.ext.restful import Api, reqparse +from flask_restful import Api, reqparse from lemur.destinations import service from lemur.auth.service import AuthenticatedResource diff --git a/lemur/domains/views.py b/lemur/domains/views.py index f6ff49c9..f76e5d0c 100644 --- a/lemur/domains/views.py +++ b/lemur/domains/views.py @@ -8,7 +8,7 @@ """ from flask import Blueprint -from flask.ext.restful import reqparse, Api +from flask_restful import reqparse, Api from lemur.domains import service from lemur.auth.service import AuthenticatedResource diff --git a/lemur/endpoints/views.py b/lemur/endpoints/views.py index c78cffa4..1c67e430 100644 --- a/lemur/endpoints/views.py +++ b/lemur/endpoints/views.py @@ -6,7 +6,7 @@ .. moduleauthor:: Kevin Glisson """ from flask import Blueprint, g -from flask.ext.restful import reqparse, Api +from flask_restful import reqparse, Api from lemur.common.utils import paginated_parser from lemur.common.schema import validate_schema diff --git a/lemur/logs/views.py b/lemur/logs/views.py index 7c32c747..6cfad42c 100644 --- a/lemur/logs/views.py +++ b/lemur/logs/views.py @@ -6,7 +6,7 @@ .. moduleauthor:: Kevin Glisson """ from flask import Blueprint -from flask.ext.restful import reqparse, Api +from flask_restful import reqparse, Api from lemur.common.schema import validate_schema from lemur.common.utils import paginated_parser diff --git a/lemur/manage.py b/lemur/manage.py index d3c915ca..af6702e6 100755 --- a/lemur/manage.py +++ b/lemur/manage.py @@ -17,8 +17,8 @@ from gunicorn.config import make_settings from cryptography.fernet import Fernet from flask import current_app -from flask.ext.script import Manager, Command, Option, prompt_pass -from flask.ext.migrate import Migrate, MigrateCommand, stamp +from flask_script import Manager, Command, Option, prompt_pass +from flask_migrate import Migrate, MigrateCommand, stamp from flask_script.commands import ShowUrls, Clean, Server from lemur import database diff --git a/lemur/migrations/versions/7f71c0cea31a_.py b/lemur/migrations/versions/7f71c0cea31a_.py index 78353209..04bb02ea 100644 --- a/lemur/migrations/versions/7f71c0cea31a_.py +++ b/lemur/migrations/versions/7f71c0cea31a_.py @@ -32,4 +32,4 @@ def upgrade(): def downgrade(): - op.drop_constraint(None, 'certificates', type_='unique') \ No newline at end of file + op.drop_constraint(None, 'certificates', type_='unique') diff --git a/lemur/notifications/views.py b/lemur/notifications/views.py index ee2e7ad3..6d67d8a6 100644 --- a/lemur/notifications/views.py +++ b/lemur/notifications/views.py @@ -7,7 +7,7 @@ .. moduleauthor:: Kevin Glisson """ from flask import Blueprint -from flask.ext.restful import Api, reqparse +from flask_restful import Api, reqparse from lemur.notifications import service from lemur.notifications.schemas import notification_input_schema, notification_output_schema, notifications_output_schema diff --git a/lemur/plugins/views.py b/lemur/plugins/views.py index d92d5dc2..9f98c37f 100644 --- a/lemur/plugins/views.py +++ b/lemur/plugins/views.py @@ -7,7 +7,7 @@ .. moduleauthor:: Kevin Glisson """ from flask import Blueprint -from flask.ext.restful import Api, reqparse +from flask_restful import Api, reqparse from lemur.auth.service import AuthenticatedResource diff --git a/lemur/roles/views.py b/lemur/roles/views.py index 6cbe5fcd..57705f1b 100644 --- a/lemur/roles/views.py +++ b/lemur/roles/views.py @@ -9,7 +9,7 @@ """ from flask import Blueprint, g from flask import make_response, jsonify -from flask.ext.restful import reqparse, Api +from flask_restful import reqparse, Api from lemur.roles import service from lemur.auth.service import AuthenticatedResource diff --git a/lemur/sources/views.py b/lemur/sources/views.py index 603a1af1..c8ef71ea 100644 --- a/lemur/sources/views.py +++ b/lemur/sources/views.py @@ -7,7 +7,7 @@ .. moduleauthor:: Kevin Glisson """ from flask import Blueprint -from flask.ext.restful import Api, reqparse +from flask_restful import Api, reqparse from lemur.sources import service from lemur.common.schema import validate_schema diff --git a/lemur/tests/conftest.py b/lemur/tests/conftest.py index 61614266..95863cf3 100644 --- a/lemur/tests/conftest.py +++ b/lemur/tests/conftest.py @@ -3,7 +3,7 @@ import pytest from flask import current_app -from flask.ext.principal import identity_changed, Identity +from flask_principal import identity_changed, Identity from lemur import create_app from lemur.database import db as _db diff --git a/lemur/users/views.py b/lemur/users/views.py index 43445286..8796c209 100644 --- a/lemur/users/views.py +++ b/lemur/users/views.py @@ -6,7 +6,7 @@ .. moduleauthor:: Kevin Glisson """ from flask import g, Blueprint -from flask.ext.restful import reqparse, Api +from flask_restful import reqparse, Api from lemur.common.schema import validate_schema from lemur.common.utils import paginated_parser