diff options
author | Vincent Post <cent@spline.de> | 2020-08-07 16:57:39 +0200 |
---|---|---|
committer | Jonah BrĂ¼chert <jbb@kaidan.im> | 2023-05-22 00:28:11 +0200 |
commit | c70cd40a012760e584677940d90d4d6613176238 (patch) | |
tree | a38308fd83e59449c0e64b5344be1e89c766dd4d /accounts/backend | |
parent | b8621b58e879732ecf81593dc34638533df2a212 (diff) | |
download | web-c70cd40a012760e584677940d90d4d6613176238.tar.gz web-c70cd40a012760e584677940d90d4d6613176238.tar.bz2 web-c70cd40a012760e584677940d90d4d6613176238.zip |
2to3 -w accounts contrib
Diffstat (limited to 'accounts/backend')
-rw-r--r-- | accounts/backend/mail/dummy.py | 6 | ||||
-rw-r--r-- | accounts/backend/mail/sendmail.py | 2 | ||||
-rw-r--r-- | accounts/backend/user/dummy.py | 2 | ||||
-rw-r--r-- | accounts/backend/user/ldap.py | 10 |
4 files changed, 10 insertions, 10 deletions
diff --git a/accounts/backend/mail/dummy.py b/accounts/backend/mail/dummy.py index ad38d42..61e7b75 100644 --- a/accounts/backend/mail/dummy.py +++ b/accounts/backend/mail/dummy.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import + from . import Backend from accounts.utils import ensure_utf8 @@ -41,8 +41,8 @@ class DummyBackend(Backend): if not self.plain: body = "\n| ".join(body.split("\n")) - print(self.format.format( + print((self.format.format( subject=ensure_utf8(content.subject()), sender=ensure_utf8(content.sender()), to=ensure_utf8(recipient), - body=ensure_utf8(body))) + body=ensure_utf8(body)))) diff --git a/accounts/backend/mail/sendmail.py b/accounts/backend/mail/sendmail.py index 9a39b03..84900db 100644 --- a/accounts/backend/mail/sendmail.py +++ b/accounts/backend/mail/sendmail.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import + import subprocess from email.mime.text import MIMEText diff --git a/accounts/backend/user/dummy.py b/accounts/backend/user/dummy.py index c7afdb7..573ac85 100644 --- a/accounts/backend/user/dummy.py +++ b/accounts/backend/user/dummy.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import + from copy import deepcopy from fnmatch import fnmatch 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')]) |