karolyi
/
py3-validate-email
3
3
Fork 4
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Simplify code on DNS name resolving

This commit is contained in:
László Károlyi 2021-02-11 15:10:31 +01:00
parent c92bd0c5c0
commit a691f359bb
Signed by: karolyi
GPG Key ID: 2DCAF25E55735BFE
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_mx_check.py
View File

@ -53,7 +53,7 @@ class GetMxRecordsTestCase(TestCase):
SimpleNamespace(exchange=DnsNameStub(value='valid2.host.')),
]
result = _get_mx_records(domain='testdomain3', timeout=10)
self.assertListEqual(result, ['valid.host.', 'valid2.host.'])
self.assertListEqual(result, ['valid.host', 'valid2.host'])
@patch.object(target=mx_module, attribute='query', new=TEST_QUERY)
def test_raises_exception_on_dns_timeout(self):

10
validate_email/mx_check.py
View File

@ -52,11 +52,11 @@ def _get_mx_records(domain: str, timeout: int) -> list:
raise DNSConfigurationError
except NoAnswer:
raise NoMXError
to_check = dict()
to_check = set()
for record in records: # type: MX
dns_str = record.exchange.to_text() # type: str
to_check[dns_str] = dns_str[:-1] if dns_str.endswith('.') else dns_str
result = [k for k, v in to_check.items() if HOST_REGEX.search(string=v)]
dns_str = record.exchange.to_text().rstrip('.') # type: str
to_check.add(dns_str)
result = [x for x in to_check if HOST_REGEX.search(string=x)]
if not result:
raise NoValidMXError
return result
@ -150,7 +150,7 @@ def _check_mx_records(
for mx_record in mx_records:
try:
found_ambigious |= _check_one_mx(
error_messages=error_messages, mx_record=mx_record.rstrip('.'),
error_messages=error_messages, mx_record=mx_record,
helo_host=helo_host, from_address=from_address,
email_address=email_address, smtp_timeout=smtp_timeout,
debug=debug)