diff options
| author | Erik Johnston <erik@matrix.org> | 2014-10-30 11:18:28 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-10-30 11:18:28 +0000 |
| commit | ef9c4476a0eb653637040f86dd900252cad30567 (patch) | |
| tree | ad14ecbbb2a03ceb47f8fba558994edd3d71b9df /synapse/util/emailutils.py | |
| parent | Fix SQL so that accepts we may want to persist events twice. (diff) | |
| parent | SYWEB-12: Add a 'Room Info' button which displays all state content. (diff) | |
| download | synapse-ef9c4476a0eb653637040f86dd900252cad30567.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
Diffstat (limited to 'synapse/util/emailutils.py')
| -rw-r--r-- | synapse/util/emailutils.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/util/emailutils.py b/synapse/util/emailutils.py index cdb0abd7ea..7038cab6c2 100644 --- a/synapse/util/emailutils.py +++ b/synapse/util/emailutils.py @@ -42,8 +42,8 @@ def send_email(smtp_server, from_addr, to_addr, subject, body): EmailException if there was a problem sending the mail. """ if not smtp_server or not from_addr or not to_addr: - raise EmailException("Need SMTP server, from and to addresses. Check " + - "the config to set these.") + raise EmailException("Need SMTP server, from and to addresses. Check" + " the config to set these.") msg = MIMEMultipart('alternative') msg['Subject'] = subject @@ -68,4 +68,4 @@ def send_email(smtp_server, from_addr, to_addr, subject, body): twisted.python.log.err() ese = EmailException() ese.cause = origException - raise ese \ No newline at end of file + raise ese |