diff --git a/lmfdb/users/__init__.py b/lmfdb/users/__init__.py index e485182c9c..bf5229cb16 100644 --- a/lmfdb/users/__init__.py +++ b/lmfdb/users/__init__.py @@ -1,15 +1,20 @@ # -*- coding: utf-8 -*- -from .main import (login_page, login_manager, admin_required, knowl_reviewer_required, - housekeeping, FLASK_LOGIN_VERSION, FLASK_LOGIN_LIMIT) +from .main import ( + login_page, + login_manager, + admin_required, + knowl_reviewer_required, + housekeeping, +) + assert admin_required # silence pyflakes assert knowl_reviewer_required # silence pyflakes assert housekeeping # silence pyflakes from lmfdb.app import app from lmfdb.logger import make_logger -from distutils.version import StrictVersion login_manager.init_app(app) @@ -17,12 +22,3 @@ app.register_blueprint(login_page, url_prefix="/users") users_logger = make_logger("users", hl=True) - -if StrictVersion(FLASK_LOGIN_VERSION) < StrictVersion(FLASK_LOGIN_LIMIT): - users_logger.warning( - "DEPRECATION-WARNING: " - "flask-login is older than version {version}. " - "Versions older than {version} have different functionality and may " - "stop working in the future. " - "Consider updating, perhaps through " - "`sage -pip install flask-login`.".format(version=FLASK_LOGIN_LIMIT)) diff --git a/lmfdb/users/main.py b/lmfdb/users/main.py index 4e7224b2a4..a8492b99b4 100644 --- a/lmfdb/users/main.py +++ b/lmfdb/users/main.py @@ -8,8 +8,7 @@ from lmfdb.app import app from lmfdb.logger import make_logger from flask import render_template, request, Blueprint, url_for, make_response -from flask_login import login_required, login_user, current_user, logout_user, LoginManager, __version__ as FLASK_LOGIN_VERSION -from distutils.version import StrictVersion +from flask_login import login_required, login_user, current_user, logout_user, LoginManager from lmfdb.utils import flash_error from markupsafe import Markup @@ -25,8 +24,6 @@ login_manager = LoginManager() -# We log a warning if the version of flask-login is less than FLASK_LOGIN_LIMIT -FLASK_LOGIN_LIMIT = '0.3.0' from .pwdmanager import userdb, LmfdbUser, LmfdbAnonymousUser base_url = "http://beta.lmfdb.org" @@ -64,10 +61,7 @@ def ctx_proc_userdata(): userdata['userid'] = 'anon' if current_user.is_anonymous() else current_user._uid userdata['username'] = 'Anonymous' if current_user.is_anonymous() else current_user.name - if StrictVersion(FLASK_LOGIN_VERSION) > StrictVersion(FLASK_LOGIN_LIMIT): - userdata['user_is_authenticated'] = current_user.is_authenticated - else: - userdata['user_is_authenticated'] = current_user.is_authenticated() + userdata['user_is_authenticated'] = current_user.is_authenticated userdata['user_is_admin'] = current_user.is_admin() userdata['user_can_review_knowls'] = current_user.is_knowl_reviewer() diff --git a/lmfdb/users/pwdmanager.py b/lmfdb/users/pwdmanager.py index 3b21a6a368..5b09e2acb1 100755 --- a/lmfdb/users/pwdmanager.py +++ b/lmfdb/users/pwdmanager.py @@ -14,8 +14,7 @@ from psycopg2.sql import SQL, Identifier, Placeholder from datetime import datetime, timedelta -from .main import logger, FLASK_LOGIN_VERSION, FLASK_LOGIN_LIMIT -from distutils.version import StrictVersion +from .main import logger # Read about flask-login if you are unfamiliar with this UserMixin/Login from flask_login import UserMixin, AnonymousUserMixin @@ -301,8 +300,6 @@ def id(self): def is_anonymous(self): """required by flask-login user class""" - if StrictVersion(FLASK_LOGIN_VERSION) < StrictVersion(FLASK_LOGIN_LIMIT): - return not self.is_authenticated() return not self.is_authenticated def is_admin(self):