Mercurial Repository: p/roundup/code: roundup/roundupdb.py comparison

comparison roundup/roundupdb.py @ 4092:4b0ddce43d08

migrate from MimeWriter to email

author	Richard Jones <richard@users.sourceforge.net>
date	Thu, 12 Mar 2009 05:55:16 +0000
parents	ef0b4396888a
children	da682f38bad3

comparison

equal deleted inserted replaced

-:09e79cbeb827
+:4b0ddce43d08
 """Extending hyperdb with types specific to issue-tracking.
 """
 __docformat__ = 'restructuredtext'
 import re, os, smtplib, socket, time, random
-import cStringIO, base64, quopri, mimetypes
+import cStringIO, base64, mimetypes
 import os.path
 import logging
+from email import Encoders
-from rfc2822 import encode_header
+from email.Utils import formataddr
+from email.Header import Header
+from email.MIMEText import MIMEText
+from email.MIMEBase import MIMEBase
 from roundup import password, date, hyperdb
 from roundup.i18n import _
 # MessageSendError is imported for backwards compatibility
-from roundup.mailer import Mailer, straddr, MessageSendError
+from roundup.mailer import Mailer, MessageSendError, encode_quopri
 class Database:
 # remember the journal uid for the current journaltag so that:
 # a. we don't have to look it up every time we need it, and
 return userid
 def log_debug(self, msg, *args, **kwargs):
 """Log a message with level DEBUG."""
 logger = self.get_logger()
 logger.debug(msg, *args, **kwargs)
 def log_info(self, msg, *args, **kwargs):
 """Log a message with level INFO."""
 logger = self.get_logger()
 logger.info(msg, *args, **kwargs)
 def get_logger(self):
 """Return the logger for this database."""
 # Because getting a logger requires acquiring a lock, we want
 # to do it only once.
 if not hasattr(self, '__logger'):
 self.__logger = logging.getLogger('hyperdb')
 return self.__logger
 class DetectorError(RuntimeError):
 """ Raised by detectors that want to indicate that something's amiss
 if not authname:
 authname = users.get(authid, 'username', '')
 authaddr = users.get(authid, 'address', '')
 if authaddr and self.db.config.MAIL_ADD_AUTHOREMAIL:
-authaddr = " <%s>" % straddr( ('',authaddr) )
+authaddr = " <%s>" % formataddr( ('',authaddr) )
 elif authaddr:
 authaddr = ""
 # make the message body
 m = ['']
 # put in roundup's signature
 if self.db.config.EMAIL_SIGNATURE_POSITION == 'bottom':
 m.append(self.email_signature(nodeid, msgid))
-# encode the content as quoted-printable
+# figure the encoding
 charset = getattr(self.db.config, 'EMAIL_CHARSET', 'utf-8')
-m = '\n'.join(m)
-if charset != 'utf-8':
+# construct the content and convert to unicode object
-m = unicode(m, 'utf-8').encode(charset)
+content = unicode('\n'.join(m), 'utf-8').encode(charset)
-content = cStringIO.StringIO(m)
-content_encoded = cStringIO.StringIO()
-quopri.encode(content, content_encoded, 0)
-content_encoded = content_encoded.getvalue()
 # make sure the To line is always the same (for testing mostly)
 sendto.sort()
 # make sure we have a from address
 # send an individual message per recipient?
 if self.db.config.NOSY_EMAIL_SENDING != 'single':
 sendto = [[address] for address in sendto]
 else:
 sendto = [sendto]
+tracker_name = unicode(self.db.config.TRACKER_NAME, 'utf-8')
+tracker_name = formataddr((tracker_name, from_address))
+tracker_name = Header(tracker_name, charset)
 # now send one or more messages
 # TODO: I believe we have to create a new message each time as we
 # can't fiddle the recipients in the message ... worth testing
 # and/or fixing some day
 first = True
 for sendto in sendto:
 # create the message
 mailer = Mailer(self.db.config)
-message, writer = mailer.get_standard_message(sendto, subject,
-author)
+message = mailer.get_standard_message(sendto, subject, author,
+multipart=message_files)
 # set reply-to to the tracker
-tracker_name = self.db.config.TRACKER_NAME
+message['Reply-To'] = tracker_name
-if charset != 'utf-8':
-tracker = unicode(tracker_name, 'utf-8').encode(charset)
-tracker_name = encode_header(tracker_name, charset)
-writer.addheader('Reply-To', straddr((tracker_name, from_address)))
 # message ids
 if messageid:
-writer.addheader('Message-Id', messageid)
+message['Message-Id'] = messageid
 if inreplyto:
-writer.addheader('In-Reply-To', inreplyto)
+message['In-Reply-To'] = inreplyto
 # Generate a header for each link or multilink to
 # a class that has a name attribute
 for propname, prop in self.getprops().items():
 if not isinstance(prop, (hyperdb.Link, hyperdb.Multilink)):
 values = self.get(nodeid, propname)
 if not values:
 continue
 values = [cl.get(v, 'name') for v in values]
 values = ', '.join(values)
-writer.addheader("X-Roundup-%s-%s" % (self.classname, propname),
+header = "X-Roundup-%s-%s"%(self.classname, propname)
-values)
+try:
+message[header] = values.encode('ascii')
+except UnicodeError:
+message[header] = Header(values, charset)
 if not inreplyto:
 # Default the reply to the first message
 msgs = self.get(nodeid, 'messages')
 # Assume messages are sorted by increasing message number here
 # If the issue is just being created, and the submitter didn't
 # provide a message, then msgs will be empty.
 if msgs and msgs[0] != nodeid:
 inreplyto = messages.get(msgs[0], 'messageid')
 if inreplyto:
-writer.addheader('In-Reply-To', inreplyto)
+message['In-Reply-To'] = inreplyto
 # attach files
 if message_files:
-part = writer.startmultipartbody('mixed')
+# first up the text as a part
-part = writer.nextpart()
+part = MIMEText(content)
-part.addheader('Content-Transfer-Encoding', 'quoted-printable')
+encode_quopri(part)
-body = part.startbody('text/plain; charset=%s'%charset)
+message.attach(part)
-body.write(content_encoded)
 for fileid in message_files:
 name = files.get(fileid, 'name')
 mime_type = files.get(fileid, 'type')
 content = files.get(fileid, 'content')
-part = writer.nextpart()
 if mime_type == 'text/plain':
-part.addheader('Content-Disposition',
-'attachment;\n filename="%s"'%name)
 try:
 content.decode('ascii')
 except UnicodeError:
 # the content cannot be 7bit-encoded.
 # use quoted printable
-part.addheader('Content-Transfer-Encoding',
+# XXX stuffed if we know the charset though :(
-'quoted-printable')
+part = MIMEText(content)
-body = part.startbody('text/plain')
+encode_quopri(part)
-body.write(quopri.encodestring(content))
 else:
-part.addheader('Content-Transfer-Encoding', '7bit')
+part = MIMEText(content)
-body = part.startbody('text/plain')
+part['Content-Transfer-Encoding'] = '7bit'
-body.write(content)
 else:
 # some other type, so encode it
 if not mime_type:
 # this should have been done when the file was saved
 mime_type = mimetypes.guess_type(name)[0]
 if mime_type is None:
 mime_type = 'application/octet-stream'
-part.addheader('Content-Disposition',
+main, sub = mime_type.split('/')
-'attachment;\n filename="%s"'%name)
+part = MIMEBase(main, sub)
-part.addheader('Content-Transfer-Encoding', 'base64')
+part.set_payload(content)
-body = part.startbody(mime_type)
+Encoders.encode_base64(part)
-body.write(base64.encodestring(content))
+part['Content-Disposition'] = 'attachment;\n filename="%s"'%name
-writer.lastpart()
+message.attach(part)
 else:
-writer.addheader('Content-Transfer-Encoding',
+message.set_payload(content)
-'quoted-printable')
+encode_quopri(message)
-body = writer.startbody('text/plain; charset=%s'%charset)
-body.write(content_encoded)
 if first:
 mailer.smtp_send(sendto + bcc_sendto, message)
 else:
 mailer.smtp_send(sendto, message)
 if not base.endswith('/'):
 base = base + '/'
 web = base + self.classname + nodeid
 # ensure the email address is properly quoted
-email = straddr((self.db.config.TRACKER_NAME,
+email = formataddr((self.db.config.TRACKER_NAME,
 self.db.config.TRACKER_EMAIL))
 line = '_' * max(len(web)+2, len(email))
 return '\n%s\n%s\n<%s>\n%s'%(line, email, web, line)

Mercurial > p > roundup > code

comparison roundup/roundupdb.py @ 4092:4b0ddce43d08