diff options
Diffstat (limited to 'accounts/backend/user/ldap.py')
| -rw-r--r-- | accounts/backend/user/ldap.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/accounts/backend/user/ldap.py b/accounts/backend/user/ldap.py index 0cb18f1..57dd8ac 100644 --- a/accounts/backend/user/ldap.py +++ b/accounts/backend/user/ldap.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import + import ldap3 from ldap3.utils.conv import escape_filter_chars @@ -10,7 +10,7 @@ from accounts.models import Account def _escape(value, wildcard=False): - if not isinstance(value, basestring): + if not isinstance(value, str): value = str(value) if not wildcard: value = escape_filter_chars(value) @@ -80,7 +80,7 @@ class LdapBackend(Backend): filters['objectClass'] = 'splineAccount' filter_as_list = ['(%s=%s)' % (attr, _escape(value, wildcard)) - for attr, value in filters.items()] + for attr, value in list(filters.items())] filterstr = '(&%s)' % ''.join(filter_as_list) conn = self._connect() @@ -127,7 +127,7 @@ class LdapBackend(Backend): conn = self._connect(user_dn, account.password) attrs = {key: [(ldap3.MODIFY_REPLACE, [value])] - for key, value in account.attributes.items()} + for key, value in list(account.attributes.items())} conn.modify(user_dn, attrs) self._alter_passwords(conn, account, as_admin=as_admin) @@ -179,7 +179,7 @@ class LdapBackend(Backend): _, account.password = account.new_password_root account.new_password_root = None - for service, passwords in account.new_password_services.items(): + for service, passwords in list(account.new_password_services.items()): service_id = service.lower() service_dn = self._format_dn([('cn', service_id), ('uid', account.uid), ('ou', 'users')]) |