Mercurial > libervia-backend
diff sat/tools/common/email.py @ 3028:ab2696e34d29
Python 3 port:
/!\ this is a huge commit
/!\ starting from this commit, SàT is needs Python 3.6+
/!\ SàT maybe be instable or some feature may not work anymore, this will improve with time
This patch port backend, bridge and frontends to Python 3.
Roughly this has been done this way:
- 2to3 tools has been applied (with python 3.7)
- all references to python2 have been replaced with python3 (notably shebangs)
- fixed files not handled by 2to3 (notably the shell script)
- several manual fixes
- fixed issues reported by Python 3 that where not handled in Python 2
- replaced "async" with "async_" when needed (it's a reserved word from Python 3.7)
- replaced zope's "implements" with @implementer decorator
- temporary hack to handle data pickled in database, as str or bytes may be returned,
to be checked later
- fixed hash comparison for password
- removed some code which is not needed anymore with Python 3
- deactivated some code which needs to be checked (notably certificate validation)
- tested with jp, fixed reported issues until some basic commands worked
- ported Primitivus (after porting dependencies like urwid satext)
- more manual fixes
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Tue, 13 Aug 2019 19:08:41 +0200 |
| parents | 3caf460bc125 |
| children | ca6c695c65da |
line wrap: on
line diff
--- a/sat/tools/common/email.py Wed Jul 31 11:31:22 2019 +0200 +++ b/sat/tools/common/email.py Tue Aug 13 19:08:41 2019 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # SàT: a jabber client @@ -19,14 +19,14 @@ """email sending facilities""" -from __future__ import absolute_import + from email.mime.text import MIMEText from twisted.mail import smtp from sat.core.constants import Const as C from sat.tools import config as tools_config -def sendEmail(config, to_emails, subject=u"", body=u"", from_email=None): +def sendEmail(config, to_emails, subject="", body="", from_email=None): """Send an email using SàT configuration @param config (SafeConfigParser): the configuration instance @@ -37,26 +37,26 @@ @param from_email(unicode): address of the sender @return (D): same as smtp.sendmail """ - if isinstance(to_emails, basestring): + if isinstance(to_emails, str): to_emails = to_emails.split() - email_host = tools_config.getConfig(config, None, u"email_server") or u"localhost" - email_from = tools_config.getConfig(config, None, u"email_from") + email_host = tools_config.getConfig(config, None, "email_server") or "localhost" + email_from = tools_config.getConfig(config, None, "email_from") if email_from is None: # we suppose that email domain and XMPP domain are identical - domain = tools_config.getConfig(config, None, u"xmpp_domain", u"example.net") - email_from = u"no_reply@" + domain - email_sender_domain = tools_config.getConfig(config, None, u"email_sender_domain") - email_port = int(tools_config.getConfig(config, None, u"email_port", 25)) - email_username = tools_config.getConfig(config, None, u"email_username") - email_password = tools_config.getConfig(config, None, u"email_password") + domain = tools_config.getConfig(config, None, "xmpp_domain", "example.net") + email_from = "no_reply@" + domain + email_sender_domain = tools_config.getConfig(config, None, "email_sender_domain") + email_port = int(tools_config.getConfig(config, None, "email_port", 25)) + email_username = tools_config.getConfig(config, None, "email_username") + email_password = tools_config.getConfig(config, None, "email_password") email_auth = C.bool(tools_config.getConfig(config, None, "email_auth", C.BOOL_FALSE)) email_starttls = C.bool(tools_config.getConfig(config, None, "email_starttls", C.BOOL_FALSE)) msg = MIMEText(body, "plain", "UTF-8") - msg[u"Subject"] = subject - msg[u"From"] = email_from - msg[u"To"] = u", ".join(to_emails) + msg["Subject"] = subject + msg["From"] = email_from + msg["To"] = ", ".join(to_emails) return smtp.sendmail( email_host.encode("utf-8"),