summaryrefslogtreecommitdiff
path: root/pgweb/mailqueue/util.py
diff options
context:
space:
mode:
authorMagnus Hagander2019-01-17 14:30:25 +0000
committerMagnus Hagander2019-01-17 14:35:39 +0000
commit87237f6536a1e6df112ca34818cf8459cb04fc68 (patch)
tree1c85c7d11382bb7ef6a2c98e780df7b8ffd59e8d /pgweb/mailqueue/util.py
parentb2ed4946551c098079d1a156b222d4ebf5c85cba (diff)
Tabs, meet your new overlords: spaces
In a quest to reach pep8, use spaces to indent rather than tabs.
Diffstat (limited to 'pgweb/mailqueue/util.py')
-rw-r--r--pgweb/mailqueue/util.py84
1 files changed, 42 insertions, 42 deletions
diff --git a/pgweb/mailqueue/util.py b/pgweb/mailqueue/util.py
index 9f09e728..71c63350 100644
--- a/pgweb/mailqueue/util.py
+++ b/pgweb/mailqueue/util.py
@@ -9,49 +9,49 @@ from email.header import Header
from models import QueuedMail
def _encoded_email_header(name, email):
- if name:
- return formataddr((str(Header(name, 'utf-8')), email))
- return email
+ if name:
+ return formataddr((str(Header(name, 'utf-8')), email))
+ return email
def send_simple_mail(sender, receiver, subject, msgtxt, attachments=None, usergenerated=False, cc=None, replyto=None, sendername=None, receivername=None, messageid=None):
- # attachment format, each is a tuple of (name, mimetype,contents)
- # content should be *binary* and not base64 encoded, since we need to
- # use the base64 routines from the email library to get a properly
- # formatted output message
- msg = MIMEMultipart()
- msg['Subject'] = subject
- msg['To'] = _encoded_email_header(receivername, receiver)
- msg['From'] = _encoded_email_header(sendername, sender)
- if cc:
- msg['Cc'] = cc
- if replyto:
- msg['Reply-To'] = replyto
- msg['Date'] = formatdate(localtime=True)
- if messageid:
- msg['Message-ID'] = messageid
- else:
- msg['Message-ID'] = make_msgid()
-
- msg.attach(MIMEText(msgtxt, _charset='utf-8'))
-
- if attachments:
- for filename, contenttype, content in attachments:
- main,sub = contenttype.split('/')
- part = MIMENonMultipart(main,sub)
- part.set_payload(content)
- part.add_header('Content-Disposition', 'attachment; filename="%s"' % filename)
- encoders.encode_base64(part)
- msg.attach(part)
-
-
- # Just write it to the queue, so it will be transactionally rolled back
- QueuedMail(sender=sender, receiver=receiver, fullmsg=msg.as_string(), usergenerated=usergenerated).save()
- if cc:
- # Write a second copy for the cc, wihch will be delivered
- # directly to the recipient. (The sender doesn't parse the
- # message content to extract cc fields).
- QueuedMail(sender=sender, receiver=cc, fullmsg=msg.as_string(), usergenerated=usergenerated).save()
+ # attachment format, each is a tuple of (name, mimetype,contents)
+ # content should be *binary* and not base64 encoded, since we need to
+ # use the base64 routines from the email library to get a properly
+ # formatted output message
+ msg = MIMEMultipart()
+ msg['Subject'] = subject
+ msg['To'] = _encoded_email_header(receivername, receiver)
+ msg['From'] = _encoded_email_header(sendername, sender)
+ if cc:
+ msg['Cc'] = cc
+ if replyto:
+ msg['Reply-To'] = replyto
+ msg['Date'] = formatdate(localtime=True)
+ if messageid:
+ msg['Message-ID'] = messageid
+ else:
+ msg['Message-ID'] = make_msgid()
+
+ msg.attach(MIMEText(msgtxt, _charset='utf-8'))
+
+ if attachments:
+ for filename, contenttype, content in attachments:
+ main,sub = contenttype.split('/')
+ part = MIMENonMultipart(main,sub)
+ part.set_payload(content)
+ part.add_header('Content-Disposition', 'attachment; filename="%s"' % filename)
+ encoders.encode_base64(part)
+ msg.attach(part)
+
+
+ # Just write it to the queue, so it will be transactionally rolled back
+ QueuedMail(sender=sender, receiver=receiver, fullmsg=msg.as_string(), usergenerated=usergenerated).save()
+ if cc:
+ # Write a second copy for the cc, wihch will be delivered
+ # directly to the recipient. (The sender doesn't parse the
+ # message content to extract cc fields).
+ QueuedMail(sender=sender, receiver=cc, fullmsg=msg.as_string(), usergenerated=usergenerated).save()
def send_mail(sender, receiver, fullmsg, usergenerated=False):
- # Send an email, prepared as the full MIME encoded mail already
- QueuedMail(sender=sender, receiver=receiver, fullmsg=fullmsg, usergenerated=False).save()
+ # Send an email, prepared as the full MIME encoded mail already
+ QueuedMail(sender=sender, receiver=receiver, fullmsg=fullmsg, usergenerated=False).save()