rtems/rtems-tools
1
0
Fork 0
mirror of https://git.rtems.org/rtems-tools/ synced 2025-10-17 14:48:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Python 3 compatibility

Browse Source
This commit is contained in:
Sebastian Huber
2015-11-12 11:15:23 +01:00
parent ab922fec9c
commit 04a52040ae
28 changed files with 284 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtemstoolkit/mailer.py
View File

@@ -75,7 +75,7 @@ class mail:
mrc = open(mailrc, 'r')
lines = mrc.readlines()
mrc.close()
except IOError, err:
except IOError as err:
raise error.general('error reading: %s' % (mailrc))
for l in lines:
l = _clean(l)
@@ -104,9 +104,9 @@ class mail:
try:
s = smtplib.SMTP(self.smtp_host())
s.sendmail(from_addr, [to_addr], msg)
except smtplib.SMTPException, se:
except smtplib.SMTPException as se:
raise error.general('sending mail: %s' % (str(se)))
except socket.error, se:
except socket.error as se:
raise error.general('sending mail: %s' % (str(se)))
if __name__ == '__main__':
@@ -115,6 +115,6 @@ if __name__ == '__main__':
append_options(optargs)
opts = options.load(sys.argv, optargs = optargs, defaults = 'defaults.mc')
m = mail(opts)
print 'From: %s' % (m.from_address())
print 'SMTP Host: %s' % (m.smtp_host())
print('From: %s' % (m.from_address()))
print('SMTP Host: %s' % (m.smtp_host()))
m.send(m.from_address(), 'Test mailer.py', 'This is a test')