Hopiu/linkchecker
1
0
Fork 0
mirror of https://github.com/Hopiu/linkchecker.git synced 2026-04-28 10:04:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix username param

Browse source 
git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@2133 e7d03fd6-7b0d-0410-9947-9c21f3af8025
This commit is contained in:
calvin 2005-01-11 13:32:47 +00:00
parent b3e3448f96
commit 15364fc362
1 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
linkcheck/checker/mailtourl.py
View file

@ -97,36 +97,39 @@ class MailtoUrl (urlbase.UrlBase):
if not self.addresses:
self.add_warning(_("No addresses found."))
return
value = "unknown reason"
for name, mail in self.addresses:
linkcheck.log.debug(linkcheck.LOG_CHECK,
"checking mail address %r", mail)
linkcheck.log.debug(linkcheck.LOG_CHECK, "splitting address")
username, domain = self._split_address(mail)
linkcheck.log.debug(linkcheck.LOG_CHECK,
"looking up MX mailhost %r", domain)
answers = linkcheck.dns.resolver.query(domain, 'MX')
if len(answers) == 0:
self.add_warning(_("No MX mail host for %(domain)s found.") %\
{'domain': domain})
return
# sort according to preference (lower preference means this
# host should be preferred
mxdata = [(rdata.preference,
self.check_smtp_domain(name, mail)
def check_smtp_domain (self, name, mail):
"""Check a single mail address"""
linkcheck.log.debug(linkcheck.LOG_CHECK,
"checking mail address %r", mail)
linkcheck.log.debug(linkcheck.LOG_CHECK, "splitting address")
username, domain = self._split_address(mail)
linkcheck.log.debug(linkcheck.LOG_CHECK,
"looking up MX mailhost %r", domain)
answers = linkcheck.dns.resolver.query(domain, 'MX')
if len(answers) == 0:
self.add_warning(_("No MX mail host for %(domain)s found.") % \
{'domain': domain})
return
# sort according to preference (lower preference means this
# host should be preferred
mxdata = [(rdata.preference,
rdata.exchange.to_text(omit_final_dot=True))
for rdata in answers]
mxdata.sort()
# debug output
mxdata.sort()
# debug output
linkcheck.log.debug(linkcheck.LOG_CHECK,
"found %d MX mailhosts:", len(answers))
for preference, host in mxdata:
linkcheck.log.debug(linkcheck.LOG_CHECK,
"found %d MX mailhosts:", len(answers))
for preference, host in mxdata:
linkcheck.log.debug(linkcheck.LOG_CHECK,
"MX host %r, preference %d", host, preference)
# connect
self.check_smtp_connect(mxdata)
# connect
self.check_smtp_connect(mxdata, username)
def check_smtp_connect (self, mxdata):
def check_smtp_connect (self, mxdata, username):
"""mxdata is a list of (preference, host) tuples to check for"""
smtpconnect = 0
for preference, host in mxdata:
@ -148,7 +151,7 @@ class MailtoUrl (urlbase.UrlBase):
{'info': str(info[1])})
except smtplib.SMTPException, msg:
self.add_warning(
_("MX mail host %(host)s did not accept connections: "\
_("MX mail host %(host)s did not accept connections: " \
"%(error)s.") % {'host': host, 'error': str(msg)})
if smtpconnect:
break