Drop support for Python <3.6 and dnspython 1.x

Author: JoshData

CHANGELOG.md

@@ -1,6 +1,7 @@
 In Development
 --------------
 
+* Python versions through 3.5 and dnspython 1.x are no longer supported. Python 3.6+ with dnspython 2.x are now required.
 * The library has been reorganized internally into smaller modules.
 
 Version 1.3.1 (January 21, 2023)

README.md

@@ -2,19 +2,19 @@ email-validator: Validate Email Addresses
 =========================================
 
 A robust email address syntax and deliverability validation library for
-Python by [Joshua Tauberer](https://joshdata.me).
+Python 3.6+ by [Joshua Tauberer](https://joshdata.me).
 
-This library validates that a string is of the form `name@example.com`. This is
-the sort of validation you would want for an email-based login form on 
-a website.
+This library validates that a string is of the form `name@example.com` and optionally checks that the domain name is set up to receive email. This is
+the sort of validation you would want for an email-based registration form on 
+a website (but not necessarily for composing an email message).
 
 Key features:
 
 * Checks that an email address has the correct syntax --- good for
-  login forms or other uses related to identifying users.
+  registration/login forms or other uses related to identifying users.
 * Gives friendly error messages when validation fails (appropriate to show
   to end users).
-* (optionally) Checks deliverability: Does the domain name resolve? And you can override the default DNS resolver.
+* (optionally) Checks deliverability: Does the domain name resolve? You can override the default DNS resolver.
 * Supports internationalized domain names and (optionally)
   internationalized local parts, but blocks unsafe characters.
 * Normalizes email addresses (super important for internationalized
@@ -27,8 +27,6 @@ And this library does NOT permit obsolete forms of email addresses, so
 if you need strict validation against the email specs exactly, use
 [pyIsEmail](https://github.com/michaelherold/pyIsEmail).
 
-This library is tested with Python 3.6+ but should work in earlier versions:
-
 [![Build Status](https://app.travis-ci.com/JoshData/python-email-validator.svg?branch=main)](https://app.travis-ci.com/JoshData/python-email-validator)
 
 View the [CHANGELOG / Release Notes](CHANGELOG.md) for the version history of changes in the library. Occasionally this README is ahead of the latest published package --- see the CHANGELOG for details.

email_validator/deliverability.py

@@ -32,21 +32,6 @@ def validate_email_deliverability(domain, domain_i18n, timeout=None, dns_resolve
 
     deliverability_info = {}
 
-    def dns_resolver_resolve_shim(domain, record):
-        try:
-            # dns.resolver.Resolver.resolve is new to dnspython 2.x.
-            # https://dnspython.readthedocs.io/en/latest/resolver-class.html#dns.resolver.Resolver.resolve
-            return dns_resolver.resolve(domain, record)
-        except AttributeError:
-            # dnspython 2.x is only available in Python 3.6 and later. For earlier versions
-            # of Python, we maintain compatibility with dnspython 1.x which has a
-            # dnspython.resolver.Resolver.query method instead. The only difference is that
-            # query may treat the domain as relative and use the system's search domains,
-            # which we prevent by adding a "." to the domain name to make it absolute.
-            # dns.resolver.Resolver.query is deprecated in dnspython version 2.x.
-            # https://dnspython.readthedocs.io/en/latest/resolver-class.html#dns.resolver.Resolver.query
-            return dns_resolver.query(domain + ".", record)
-
     try:
         # We need a way to check how timeouts are handled in the tests. So we
         # have a secret variable that if set makes this method always test the
@@ -56,7 +41,7 @@ def dns_resolver_resolve_shim(domain, record):
 
         try:
             # Try resolving for MX records.
-            response = dns_resolver_resolve_shim(domain, "MX")
+            response = dns_resolver.resolve(domain, "MX")
 
             # For reporting, put them in priority order and remove the trailing dot in the qnames.
             mtas = sorted([(r.preference, str(r.exchange).rstrip('.')) for r in response])
@@ -76,14 +61,14 @@ def dns_resolver_resolve_shim(domain, record):
 
             # If there was no MX record, fall back to an A record, as SMTP servers do.
             try:
-                response = dns_resolver_resolve_shim(domain, "A")
+                response = dns_resolver.resolve(domain, "A")
                 deliverability_info["mx"] = [(0, str(r)) for r in response]
                 deliverability_info["mx_fallback_type"] = "A"
             except (dns.resolver.NoNameservers, dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
 
                 # If there was no A record, fall back to an AAAA record.
                 try:
-                    response = dns_resolver_resolve_shim(domain, "AAAA")
+                    response = dns_resolver.resolve(domain, "AAAA")
                     deliverability_info["mx"] = [(0, str(r)) for r in response]
                     deliverability_info["mx_fallback_type"] = "AAAA"
                 except (dns.resolver.NoNameservers, dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
@@ -98,7 +83,7 @@ def dns_resolver_resolve_shim(domain, record):
             # absence of an MX record, this is probably a good sign that the
             # domain is not used for email.
             try:
-                response = dns_resolver_resolve_shim(domain, "TXT")
+                response = dns_resolver.resolve(domain, "TXT")
                 for rec in response:
                     value = b"".join(rec.strings)
                     if value.startswith(b"v=spf1 "):

setup.cfg

@@ -24,9 +24,9 @@ keywords = email address validator
 [options]
 packages = find:
 install_requires =
-    dnspython>=1.15.0
+    dnspython>=2.0.0
     idna>=2.0.0
-python_requires = >=3.5
+python_requires = >=3.6
 
 [options.entry_points]
 console_scripts =