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

fix pychecker nits

Browse Source
This commit is contained in:
Stuart Gathman
2005-06-14 20:31:26 +00:00
parent 7eb2fb09ef
commit 09582a2e86
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spf.py
+6 -4
View File
@@ -46,6 +46,9 @@ For news, bugfixes, etc. visit the home page for this implementation at
# Terrence is not responding to email. # Terrence is not responding to email.
# #
# $Log$ # $Log$
# Revision 1.4 2005/06/02 04:18:55 customdesigned
# Update copyright notices after reading article on /.
#
# Revision 1.3 2005/06/02 02:08:12 customdesigned # Revision 1.3 2005/06/02 02:08:12 customdesigned
# Reject on PermErr # Reject on PermErr
# #
@@ -684,12 +687,11 @@ class query(object):
p = CIDParser(q=self) p = CIDParser(q=self)
try: try:
return p.spf_txt(domain) return p.spf_txt(domain)
except xml.sax._exceptions.SAXParseException,x: except xml.sax._exceptions.SAXParseException:
raise PermError("Caller-ID parse error",domain) raise PermError("Caller-ID parse error",domain)
if len(a) == 1: if len(a) == 1:
return a[0] return a[0]
else:
return None return None
def dns_txt(self, domainname): def dns_txt(self, domainname):
@@ -974,12 +976,12 @@ def bin2addr(addr):
def expand_one(expansion, str, joiner): def expand_one(expansion, str, joiner):
if not str: if not str:
return expansion return expansion
len, reverse, delimiters = RE_ARGS.split(str)[1:4] ln, reverse, delimiters = RE_ARGS.split(str)[1:4]
if not delimiters: if not delimiters:
delimiters = '.' delimiters = '.'
expansion = split(expansion, delimiters, joiner) expansion = split(expansion, delimiters, joiner)
if reverse: expansion.reverse() if reverse: expansion.reverse()
if len: expansion = expansion[-int(len)*2+1:] if ln: expansion = expansion[-int(ln)*2+1:]
return ''.join(expansion) return ''.join(expansion)
def split(str, delimiters, joiner=None): def split(str, delimiters, joiner=None):