From 16a552139b3db09b312f416b97f1f0f2373fa375 Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Mon, 11 Dec 2017 19:56:46 +0100 Subject: [PATCH 2/2] Fix somes pep8 errors --- src/authentic2/backends/ldap_backend.py | 11 +++++------ tests/test_ldap.py | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/authentic2/backends/ldap_backend.py b/src/authentic2/backends/ldap_backend.py index 0b0b87f..9daf185 100644 --- a/src/authentic2/backends/ldap_backend.py +++ b/src/authentic2/backends/ldap_backend.py @@ -108,12 +108,12 @@ class LDAPUser(get_user_model()): def update_request(self): request = StoreRequestMiddleware.get_request() if request: - assert not request.session is None + assert request.session is not None self.init_to_session(request.session) def init_from_request(self): request = StoreRequestMiddleware.get_request() - assert request and not request.session is None + assert request and request.session is not None self.init_from_session(request.session) def keep_password(self, password): @@ -558,7 +558,7 @@ class LDAPBackend(object): role, error = self.get_role(block, role_id=role_name) if role is None: log.warning('error %s: couldn\'t retrieve role %r', - error, role_name) + error, role_name) continue # Add missing roles if dn in role_dns and role not in roles: @@ -660,7 +660,6 @@ class LDAPBackend(object): if group not in groups: user.groups.add(group) - def populate_mandatory_roles(self, user, block): mandatory_roles = block.get('set_mandatory_roles') if not mandatory_roles: @@ -673,7 +672,7 @@ class LDAPBackend(object): role, error = self.get_role(block, role_id=role_name) if role is None: log.warning('error %s: couldn\'t retrieve role %r', - error, role_name) + error, role_name) continue if role not in roles: user.roles.add(role) @@ -728,7 +727,7 @@ class LDAPBackend(object): attributes = set() attributes.update(map(str, block['attributes'])) for field in ('email_field', 'fname_field', 'lname_field', - 'member_of_attribute'): + 'member_of_attribute'): if block[field]: attributes.add(block[field]) for external_id_tuple in block['external_id_tuples']: diff --git a/tests/test_ldap.py b/tests/test_ldap.py index b0e6a14..3ffcb12 100644 --- a/tests/test_ldap.py +++ b/tests/test_ldap.py @@ -165,6 +165,7 @@ def test_simple_with_binddn(slapd, settings, client): assert not user.check_password(PASS) assert 'password' not in client.session['ldap-data'] + @pytest.mark.django_db def test_double_login(slapd, simple_user, settings, app): settings.LDAP_AUTH_SETTINGS = [{ -- 2.1.4