[tor-commits] [bridgedb/master] Use `smtp` rather than `twisted.mail.smtp` in EmailServer.composeMail().

[isis@xxxxxxxxxxxxxx]

commit a020c975387fc47c1632c80ee19d66222dc2f5b1
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Mon Apr 7 02:57:34 2014 +0000

    Use `smtp` rather than `twisted.mail.smtp` in EmailServer.composeMail().
---
 lib/bridgedb/EmailServer.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py
index 2d2158d..599b446 100644
--- a/lib/bridgedb/EmailServer.py
+++ b/lib/bridgedb/EmailServer.py
@@ -442,12 +442,12 @@ def composeEmail(fromAddr, clientAddr, subject, body, msgID=False,
     msg = message.Message()
     msg.add_header("From", fromAddr)
     msg.add_header("To", clientAddr)
-    msg.add_header("Message-ID", twisted.mail.smtp.messageid())
+    msg.add_header("Message-ID", smtp.messageid())
     if not subject.startswith("Re:"): subject = "Re: %s"%subject
     msg.add_header("Subject", subject)
     if msgID:
         msg.add_header("In-Reply-To", msgID)
-    msg.add_header("Date", twisted.mail.smtp.rfc822date())
+    msg.add_header("Date", smtp.rfc822date())
     msg.set_default_type("text/plain")
     headers = [': '.join(m) for m in msg.items()]
     mail = StringIO("\r\n".join(headers))



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits