Merge ~pedrovfer/dkimpy:fix/warning_dns_resolve into dkimpy:master

[Pedro Vicente]

Fixes https://bugs.launchpad.net/dkimpy/+bug/2028783

call dns.resolver.resolve() instead of dns.resolver.query

/python3.10/site-packages/dkim/dnsplug.py:32: DeprecationWarning: please use dns.resolver.resolve() instead
    a = dns.resolver.query(name, dns.rdatatype.TXT,raise_on_no_answer=False, lifetime=timeout)

[Scott Kitterman (kitterman)]

I think that's good. Do you know when dns.resolver was introduced? We should also probably set the minimum version for dnspython accordingly.

review: Needs Information

aa50562... by Pedro Vicente <email address hidden> on 2023-07-27

Change minimun version for dnspython due to deprecation warning

[Pedro Vicente (pedrovfer)]

> I think that's good. Do you know when dns.resolver was introduced? We should
> also probably set the minimum version for dnspython accordingly.

Commit was https://github.com/rthalley/dnspython/commit/997e913cd19553413a7545c7568f2917c0e396c2 and targets 2.0 major version, https://github.com/rthalley/dnspython/releases/tag/v2.0.0

I'll change the minimum version to 2.0 in this merge request

[Scott Kitterman (kitterman)]

Great. Thanks.

[Pedro Vicente (pedrovfer)]

> Great. Thanks.

Hi Scott, are you planning to merge it anytime soon and release a new version?

It would be great to have a timeline for it so I can be ready for the lib update in our product.

Many thanks,
Pedro

[Scott Kitterman (kitterman)]

Thanks. I'll do a release shortly.

diff --git a/dkim/dnsplug.py b/dkim/dnsplug.py
index 1ea8e3a..5c80571 100644
--- a/dkim/dnsplug.py
+++ b/dkim/dnsplug.py
@@ -29,7 +29,7 @@ def get_txt_dnspython(name, timeout=5):
     """Return a TXT record associated with a DNS name."""
     import dkim
     try:
-      a = dns.resolver.query(name, dns.rdatatype.TXT,raise_on_no_answer=False, lifetime=timeout)
+      a = dns.resolver.resolve(name, dns.rdatatype.TXT,raise_on_no_answer=False, lifetime=timeout, search=True)
       for r in a.response.answer:
           if r.rdtype == dns.rdatatype.TXT:
               return b"".join(list(r.items)[0].strings)
diff --git a/setup.py b/setup.py
index 26dc2d1..875f727 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ try:
     import DNS
     kw['install_requires'] = ['Py3DNS']
 except ImportError:  # If PyDNS is not installed, prefer dnspython
-    kw['install_requires'] = ['dnspython>=1.16.0']
+    kw['install_requires'] = ['dnspython>=2.0.0']
 
 with open("README.md", "r") as fh:
     long_description = fh.read()