From b0049442eee94a1636490c091215bd706f819558 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Sun, 29 May 2016 22:58:20 +0200 Subject: Fixed some depreciations with the new version of Flask. --- src/web/views/admin.py | 4 ++-- src/web/views/api/v2/article.py | 2 +- src/web/views/api/v2/category.py | 2 +- src/web/views/api/v2/common.py | 4 ++-- src/web/views/api/v2/feed.py | 2 +- src/web/views/api/v3/article.py | 4 ++-- src/web/views/api/v3/common.py | 4 ++-- src/web/views/api/v3/feed.py | 2 +- src/web/views/article.py | 4 ++-- src/web/views/category.py | 4 ++-- src/web/views/common.py | 4 ++-- src/web/views/feed.py | 4 ++-- src/web/views/home.py | 4 ++-- src/web/views/session_mgmt.py | 6 +++--- src/web/views/user.py | 4 ++-- src/web/views/views.py | 2 +- 16 files changed, 28 insertions(+), 28 deletions(-) (limited to 'src/web/views') diff --git a/src/web/views/admin.py b/src/web/views/admin.py index d7ec211f..9703894e 100644 --- a/src/web/views/admin.py +++ b/src/web/views/admin.py @@ -1,7 +1,7 @@ from datetime import datetime from flask import (Blueprint, render_template, redirect, flash, url_for) -from flask.ext.babel import gettext, format_timedelta -from flask.ext.login import login_required, current_user +from flask_babel import gettext, format_timedelta +from flask_login import login_required, current_user from werkzeug import generate_password_hash from web.views.common import admin_permission diff --git a/src/web/views/api/v2/article.py b/src/web/views/api/v2/article.py index 71201538..2be286c6 100644 --- a/src/web/views/api/v2/article.py +++ b/src/web/views/api/v2/article.py @@ -2,7 +2,7 @@ from conf import API_ROOT import dateutil.parser from datetime import datetime from flask import current_app -from flask.ext.restful import Api +from flask_restful import Api from web.views.common import api_permission from web.controllers import ArticleController diff --git a/src/web/views/api/v2/category.py b/src/web/views/api/v2/category.py index 21459fc5..70fda1ea 100644 --- a/src/web/views/api/v2/category.py +++ b/src/web/views/api/v2/category.py @@ -1,6 +1,6 @@ from conf import API_ROOT from flask import current_app -from flask.ext.restful import Api +from flask_restful import Api from web.controllers.category import CategoryController from web.views.api.v2.common import (PyAggResourceNew, diff --git a/src/web/views/api/v2/common.py b/src/web/views/api/v2/common.py index 0227d6cf..04b19d78 100644 --- a/src/web/views/api/v2/common.py +++ b/src/web/views/api/v2/common.py @@ -23,8 +23,8 @@ import logging from functools import wraps from werkzeug.exceptions import Unauthorized, BadRequest, Forbidden, NotFound from flask import request -from flask.ext.restful import Resource, reqparse -from flask.ext.login import current_user +from flask_restful import Resource, reqparse +from flask_login import current_user from web.views.common import admin_permission, api_permission, \ login_user_bundle, jsonify diff --git a/src/web/views/api/v2/feed.py b/src/web/views/api/v2/feed.py index 686dcd76..a5561475 100644 --- a/src/web/views/api/v2/feed.py +++ b/src/web/views/api/v2/feed.py @@ -1,6 +1,6 @@ from conf import API_ROOT from flask import current_app -from flask.ext.restful import Api +from flask_restful import Api from web.views.common import api_permission from web.controllers.feed import (FeedController, diff --git a/src/web/views/api/v3/article.py b/src/web/views/api/v3/article.py index 4f9bbb8b..9a4df1ce 100644 --- a/src/web/views/api/v3/article.py +++ b/src/web/views/api/v3/article.py @@ -26,9 +26,9 @@ __revision__ = "$Date: 2016/04/29 $" __copyright__ = "Copyright (c) Cedric Bonhomme" __license__ = "GPLv3" -from flask.ext.login import current_user +from flask_login import current_user from werkzeug.exceptions import NotFound -from flask.ext.restless import ProcessingException +from flask_restless import ProcessingException from web import models from bootstrap import application, manager from web.controllers import ArticleController, FeedController diff --git a/src/web/views/api/v3/common.py b/src/web/views/api/v3/common.py index 05ce7057..84e3da0d 100644 --- a/src/web/views/api/v3/common.py +++ b/src/web/views/api/v3/common.py @@ -27,8 +27,8 @@ __copyright__ = "Copyright (c) Cedric Bonhomme" __license__ = "GPLv3" from flask import request -from flask.ext.login import current_user -from flask.ext.restless import ProcessingException +from flask_login import current_user +from flask_restless import ProcessingException from werkzeug.exceptions import NotFound from web.controllers import ArticleController, UserController from web.views.common import login_user_bundle diff --git a/src/web/views/api/v3/feed.py b/src/web/views/api/v3/feed.py index 1c32929f..cc9f5cad 100644 --- a/src/web/views/api/v3/feed.py +++ b/src/web/views/api/v3/feed.py @@ -26,7 +26,7 @@ __revision__ = "$Date: 2016/04/29 $" __copyright__ = "Copyright (c) Cedric Bonhomme" __license__ = "GPLv3" -from flask.ext.login import current_user +from flask_login import current_user from web import models from bootstrap import application, manager from web.controllers import FeedController diff --git a/src/web/views/article.py b/src/web/views/article.py index fea4aa06..eed9a9d3 100644 --- a/src/web/views/article.py +++ b/src/web/views/article.py @@ -2,8 +2,8 @@ from datetime import datetime, timedelta from flask import (Blueprint, g, render_template, redirect, flash, url_for, make_response, request) -from flask.ext.babel import gettext -from flask.ext.login import login_required, current_user +from flask_babel import gettext +from flask_login import login_required, current_user from bootstrap import db diff --git a/src/web/views/category.py b/src/web/views/category.py index c54ebe9b..1a81a5c4 100644 --- a/src/web/views/category.py +++ b/src/web/views/category.py @@ -1,6 +1,6 @@ from flask import Blueprint, render_template, flash, redirect, url_for -from flask.ext.babel import gettext -from flask.ext.login import login_required, current_user +from flask_babel import gettext +from flask_login import login_required, current_user from web.forms import CategoryForm from web.lib.utils import redirect_url diff --git a/src/web/views/common.py b/src/web/views/common.py index 690c4d1c..f9613c01 100644 --- a/src/web/views/common.py +++ b/src/web/views/common.py @@ -2,8 +2,8 @@ import json from functools import wraps from datetime import datetime from flask import current_app, Response -from flask.ext.login import login_user -from flask.ext.principal import (Identity, Permission, RoleNeed, +from flask_login import login_user +from flask_principal import (Identity, Permission, RoleNeed, session_identity_loader, identity_changed) from web.controllers import UserController from web.lib.utils import default_handler diff --git a/src/web/views/feed.py b/src/web/views/feed.py index b49495f3..6338f320 100644 --- a/src/web/views/feed.py +++ b/src/web/views/feed.py @@ -6,8 +6,8 @@ from werkzeug.exceptions import BadRequest from flask import Blueprint, render_template, flash, \ redirect, request, url_for -from flask.ext.babel import gettext -from flask.ext.login import login_required, current_user +from flask_babel import gettext +from flask_login import login_required, current_user import conf from web.lib import misc_utils, utils diff --git a/src/web/views/home.py b/src/web/views/home.py index f53299dc..179f3f9d 100644 --- a/src/web/views/home.py +++ b/src/web/views/home.py @@ -4,8 +4,8 @@ from datetime import datetime from flask import current_app, render_template, \ request, flash, url_for, redirect -from flask.ext.login import login_required, current_user -from flask.ext.babel import gettext, get_locale +from flask_login import login_required, current_user +from flask_babel import gettext, get_locale from babel.dates import format_datetime, format_timedelta import conf diff --git a/src/web/views/session_mgmt.py b/src/web/views/session_mgmt.py index a3ef8e3c..876efd3d 100644 --- a/src/web/views/session_mgmt.py +++ b/src/web/views/session_mgmt.py @@ -5,10 +5,10 @@ from werkzeug import generate_password_hash from werkzeug.exceptions import NotFound from flask import (render_template, flash, session, request, url_for, redirect, current_app) -from flask.ext.babel import gettext -from flask.ext.login import LoginManager, logout_user, \ +from flask_babel import gettext +from flask_login import LoginManager, logout_user, \ login_required, current_user -from flask.ext.principal import (Principal, AnonymousIdentity, UserNeed, +from flask_principal import (Principal, AnonymousIdentity, UserNeed, identity_changed, identity_loaded, session_identity_loader) diff --git a/src/web/views/user.py b/src/web/views/user.py index 3928f5dc..229530d1 100644 --- a/src/web/views/user.py +++ b/src/web/views/user.py @@ -2,8 +2,8 @@ import string import random from flask import (Blueprint, g, render_template, redirect, flash, url_for, request) -from flask.ext.babel import gettext -from flask.ext.login import login_required, current_user +from flask_babel import gettext +from flask_login import login_required, current_user import conf from notifications import notifications diff --git a/src/web/views/views.py b/src/web/views/views.py index b23a41a1..a7c842d7 100644 --- a/src/web/views/views.py +++ b/src/web/views/views.py @@ -1,7 +1,7 @@ import logging from flask import (request, render_template, flash, url_for, redirect, current_app) -from flask.ext.babel import gettext +from flask_babel import gettext from conf import API_ROOT from web.lib.view_utils import etag_match -- cgit