[Buildbot-commits] buildbot/buildbot/status mail.py,1.29,1.30

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/status
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12492/buildbot/status

Modified Files:
	mail.py 
Log Message:
[project @ status.mail doesn't need to fall back to twisted.protocols.smtp.sendmail in a Twisted>=2.0.0 world]

Original author: warner at lothar.com
Date: 2006-12-11 08:47:11

Index: mail.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/mail.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- mail.py	11 Dec 2006 08:40:17 -0000	1.29
+++ mail.py	11 Dec 2006 08:49:40 -0000	1.30
@@ -13,10 +13,7 @@
 import urllib
 
 from twisted.internet import defer
-try:
-    from twisted.mail.smtp import sendmail # Twisted-2.0
-except ImportError:
-    from twisted.protocols.smtp import sendmail # Twisted-1.3
+from twisted.mail.smtp import sendmail
 from twisted.python import log
 
 from buildbot import interfaces, util