From b3d7b657ab72e800f9b6df64b99eea5db33ad468 Mon Sep 17 00:00:00 2001 From: Pierre Jaury Date: Sat, 13 Aug 2016 20:51:54 +0200 Subject: [PATCH] Remove deprecated flask.ext imports --- admin/freeposte/admin/__init__.py | 3 ++- admin/freeposte/admin/forms.py | 2 +- admin/freeposte/admin/utils.py | 2 +- admin/freeposte/admin/views/admins.py | 2 +- admin/freeposte/admin/views/aliases.py | 2 +- admin/freeposte/admin/views/base.py | 2 +- admin/freeposte/admin/views/domains.py | 2 +- admin/freeposte/admin/views/fetches.py | 2 +- admin/freeposte/admin/views/managers.py | 2 +- admin/freeposte/admin/views/users.py | 2 +- 10 files changed, 11 insertions(+), 10 deletions(-) diff --git a/admin/freeposte/admin/__init__.py b/admin/freeposte/admin/__init__.py index c06fd1a8..ab268644 100644 --- a/admin/freeposte/admin/__init__.py +++ b/admin/freeposte/admin/__init__.py @@ -1,7 +1,8 @@ from flask import Blueprint -from flask.ext import login as flask_login from freeposte import login_manager, db +import flask_login + app = Blueprint( 'admin', __name__, diff --git a/admin/freeposte/admin/forms.py b/admin/freeposte/admin/forms.py index 4104104f..7a3d5962 100644 --- a/admin/freeposte/admin/forms.py +++ b/admin/freeposte/admin/forms.py @@ -1,8 +1,8 @@ from flask_wtf import Form from wtforms import validators, fields, widgets from wtforms_components import fields as fields_ -from flask.ext import login as flask_login +import flask_login import re diff --git a/admin/freeposte/admin/utils.py b/admin/freeposte/admin/utils.py index c9adfc8e..6e9d60f8 100644 --- a/admin/freeposte/admin/utils.py +++ b/admin/freeposte/admin/utils.py @@ -1,7 +1,7 @@ from freeposte.admin import models -from flask.ext import login as flask_login import flask +import flask_login def get_domain_admin(domain_name): diff --git a/admin/freeposte/admin/views/admins.py b/admin/freeposte/admin/views/admins.py index 8f5a06cb..801f79bc 100644 --- a/admin/freeposte/admin/views/admins.py +++ b/admin/freeposte/admin/views/admins.py @@ -1,9 +1,9 @@ from freeposte.admin import app, db, models, forms -from flask.ext import login as flask_login import os import pprint import flask +import flask_login import json diff --git a/admin/freeposte/admin/views/aliases.py b/admin/freeposte/admin/views/aliases.py index 6dc3faab..8d781e9f 100644 --- a/admin/freeposte/admin/views/aliases.py +++ b/admin/freeposte/admin/views/aliases.py @@ -1,8 +1,8 @@ from freeposte.admin import app, db, models, forms, utils -from flask.ext import login as flask_login import os import flask +import flask_login import wtforms_components diff --git a/admin/freeposte/admin/views/base.py b/admin/freeposte/admin/views/base.py index 2158576c..33e5d48d 100644 --- a/admin/freeposte/admin/views/base.py +++ b/admin/freeposte/admin/views/base.py @@ -1,9 +1,9 @@ from freeposte import dockercli from freeposte.admin import app, db, models, forms, utils -from flask.ext import login as flask_login import os import flask +import flask_login @app.route('/', methods=["GET"]) diff --git a/admin/freeposte/admin/views/domains.py b/admin/freeposte/admin/views/domains.py index dd242816..8c3c4b29 100644 --- a/admin/freeposte/admin/views/domains.py +++ b/admin/freeposte/admin/views/domains.py @@ -1,9 +1,9 @@ from freeposte.admin import app, db, models, forms, utils from freeposte import app as flask_app -from flask.ext import login as flask_login import os import flask +import flask_login import wtforms_components diff --git a/admin/freeposte/admin/views/fetches.py b/admin/freeposte/admin/views/fetches.py index f766f10f..c7f88d89 100644 --- a/admin/freeposte/admin/views/fetches.py +++ b/admin/freeposte/admin/views/fetches.py @@ -1,8 +1,8 @@ from freeposte.admin import app, db, models, forms, utils -from flask.ext import login as flask_login import os import flask +import flask_login import wtforms_components diff --git a/admin/freeposte/admin/views/managers.py b/admin/freeposte/admin/views/managers.py index f9c2b5f9..d7d4f57b 100644 --- a/admin/freeposte/admin/views/managers.py +++ b/admin/freeposte/admin/views/managers.py @@ -1,8 +1,8 @@ from freeposte.admin import app, db, models, forms, utils -from flask.ext import login as flask_login import os import flask +import flask_login import wtforms_components diff --git a/admin/freeposte/admin/views/users.py b/admin/freeposte/admin/views/users.py index 50d9a7ca..3374d2c2 100644 --- a/admin/freeposte/admin/views/users.py +++ b/admin/freeposte/admin/views/users.py @@ -1,8 +1,8 @@ from freeposte.admin import app, db, models, forms, utils -from flask.ext import login as flask_login import os import flask +import flask_login import wtforms_components