DandelionNStuff/pymilter
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some python3 syntax errors

Browse Source
This commit is contained in:
Stuart D. Gathman
2017-04-20 17:00:14 -04:00
parent 42e7a02638
commit 36750bac78
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Milter/dns.py
+2 -2
View File
@@ -26,8 +26,8 @@ def DNSLookup(name, qtype):
# A RR as dotted quad. For consistency, this driver should # A RR as dotted quad. For consistency, this driver should
# return both as binary string. # return both as binary string.
return [((a['name'], a['typename']), a['data']) for a in resp.answers] return [((a['name'], a['typename']), a['data']) for a in resp.answers]
except IOError, x: except IOError as x:
raise DNSError, str(x) raise DNSError(str(x))
class Session(object): class Session(object):
"""A Session object has a simple cache with no TTL that is valid """A Session object has a simple cache with no TTL that is valid
Milter/dsn.py
+3 -3
View File
@@ -142,13 +142,13 @@ def send_dsn(mailfrom,receiver,msg=None,timeout=600,session=None,ourfrom=''):
if badrcpts: if badrcpts:
return badrcpts return badrcpts
return None # success return None # success
except smtplib.SMTPRecipientsRefused,x: except smtplib.SMTPRecipientsRefused as x:
if len(x.recipients) == 1: if len(x.recipients) == 1:
return x.recipients.values()[0] # permanent error return x.recipients.values()[0] # permanent error
return x.recipients return x.recipients
except smtplib.SMTPSenderRefused,x: except smtplib.SMTPSenderRefused as x:
return x.args[:2] # does not accept DSN return x.args[:2] # does not accept DSN
except smtplib.SMTPDataError,x: except smtplib.SMTPDataError as x:
return x.args # permanent error return x.args # permanent error
except smtplib.SMTPException: except smtplib.SMTPException:
pass # any other error, try next MX pass # any other error, try next MX