From f51a2577ac6a1d9bf98dc5aecffe0db05926ccb4 Mon Sep 17 00:00:00 2001 From: Lars Holm Nielsen Date: Thu, 3 Dec 2015 09:21:06 +0100 Subject: [PATCH] global: flask-security 1.7.5 fix Signed-off-by: Lars Holm Nielsen --- invenio_i18n/selectors.py | 2 +- setup.py | 2 +- tests/test_invenio_i18n_selectors.py | 10 ++-------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/invenio_i18n/selectors.py b/invenio_i18n/selectors.py index 1a74fba..f1633b9 100644 --- a/invenio_i18n/selectors.py +++ b/invenio_i18n/selectors.py @@ -67,7 +67,7 @@ def get_locale(): # In the case of the registered user has a prefered language. if hasattr(current_app, 'login_manager') and \ - current_user.is_authenticated(): + current_user.is_authenticated: language_user_key = current_app.config['I18N_USER_LANG_ATTR'] if getattr(current_user, language_user_key, None) in locales: return getattr(current_user, language_user_key) diff --git a/setup.py b/setup.py index ffe5eb7..3e5b221 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ 'pytest-cov>=1.8.0', 'pytest-pep8>=1.0.6', 'pytest>=2.8.0', - 'Flask-Login<0.3.0,>=0.2.11', + 'Flask-Login>=0.3.0', ] extras_require = { diff --git a/tests/test_invenio_i18n_selectors.py b/tests/test_invenio_i18n_selectors.py index 3555634..7cb3b05 100644 --- a/tests/test_invenio_i18n_selectors.py +++ b/tests/test_invenio_i18n_selectors.py @@ -38,20 +38,14 @@ class FakeUser(object): def __init__(self, prefered_language): """Initialize fake user.""" + self.is_active = True + self.is_authenticated = True self.prefered_language = prefered_language - def is_active(self): - """True, fake user is active.""" - return True - def get_id(self): """Return a default ID. This is only a fake object.""" return 1 - def is_authenticated(self): - """True, fake user is authenticated.""" - return True - def test_get_locale_querystring(app): """Test getting locales from the querystring."""