From eec5a9515559e6b6a68521018e517323e159a551 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Mon, 28 Jun 2021 16:24:04 +0200
Subject: [PATCH] Bumped dnspython to 2.1.0

---
 modoboa/admin/lib.py           |  2 +-
 modoboa/admin/tests/test_mx.py | 18 +++++++++---------
 requirements.txt               |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modoboa/admin/lib.py b/modoboa/admin/lib.py
index 995ee514f..f1cd459c4 100644
--- a/modoboa/admin/lib.py
+++ b/modoboa/admin/lib.py
@@ -184,7 +184,7 @@ def get_dns_records(name, typ, resolver=None):
     if not resolver:
         resolver = get_dns_resolver()
     try:
-        dns_answers = resolver.query(name, typ)
+        dns_answers = resolver.resolve(name, typ, search=True)
     except dns.resolver.NXDOMAIN as e:
         logger.error(_("No DNS record found for %s") % name, exc_info=e)
     except dns.resolver.NoAnswer as e:
diff --git a/modoboa/admin/tests/test_mx.py b/modoboa/admin/tests/test_mx.py
index 1c8cf36ec..9d0a80164 100644
--- a/modoboa/admin/tests/test_mx.py
+++ b/modoboa/admin/tests/test_mx.py
@@ -48,7 +48,7 @@ class MXTestCase(ModoTestCase):
 
     @mock.patch("gevent.socket.gethostbyname")
     @mock.patch("socket.getaddrinfo")
-    @mock.patch.object(dns.resolver.Resolver, "query")
+    @mock.patch.object(dns.resolver.Resolver, "resolve")
     def test_management_command(
             self, mock_query, mock_getaddrinfo, mock_g_gethostbyname):
         """Check that command works fine."""
@@ -76,7 +76,7 @@ class MXTestCase(ModoTestCase):
 
     @mock.patch("gevent.socket.gethostbyname")
     @mock.patch("socket.getaddrinfo")
-    @mock.patch.object(dns.resolver.Resolver, "query")
+    @mock.patch.object(dns.resolver.Resolver, "resolve")
     def test_single_domain_update(
             self, mock_query, mock_getaddrinfo, mock_g_gethostbyname):
         """Update only one domain."""
@@ -101,7 +101,7 @@ class MXTestCase(ModoTestCase):
 
     @mock.patch("gevent.socket.gethostbyname")
     @mock.patch("socket.getaddrinfo")
-    @mock.patch.object(dns.resolver.Resolver, "query")
+    @mock.patch.object(dns.resolver.Resolver, "resolve")
     def test_invalid_mx(
             self, mock_query, mock_getaddrinfo, mock_g_gethostbyname):
         """Test to check if invalid MX records are detected."""
@@ -125,7 +125,7 @@ class MXTestCase(ModoTestCase):
         self.assertEqual(len(mail.outbox), 1)
 
     @mock.patch("socket.getaddrinfo")
-    @mock.patch.object(dns.resolver.Resolver, "query")
+    @mock.patch.object(dns.resolver.Resolver, "resolve")
     def test_get_mx_list_dns_server(self, mock_query, mock_getaddrinfo):
         """Test to get mx list from specific DNS server."""
         mock_query.side_effect = utils.mock_dns_query_result
@@ -134,7 +134,7 @@ class MXTestCase(ModoTestCase):
         get_domain_mx_list("does-not-exist.example.com")
 
     @mock.patch("ipaddress.ip_address")
-    @mock.patch.object(dns.resolver.Resolver, "query")
+    @mock.patch.object(dns.resolver.Resolver, "resolve")
     def test_get_domain_mx_list_logging(self, mock_query, mock_ip_address):
         """Test to get error loggins from specific DNS server."""
         mock_query.side_effect = utils.mock_dns_query_result
@@ -190,7 +190,7 @@ class DNSBLTestCase(ModoTestCase):
 
     @mock.patch("gevent.socket.gethostbyname")
     @mock.patch("socket.getaddrinfo")
-    @mock.patch.object(dns.resolver.Resolver, "query")
+    @mock.patch.object(dns.resolver.Resolver, "resolve")
     def test_management_command(
             self, mock_query, mock_getaddrinfo, mock_g_gethostbyname):
         """Check that command works fine."""
@@ -211,7 +211,7 @@ class DNSBLTestCase(ModoTestCase):
 
     @mock.patch("gevent.socket.gethostbyname")
     @mock.patch("socket.getaddrinfo")
-    @mock.patch.object(dns.resolver.Resolver, "query")
+    @mock.patch.object(dns.resolver.Resolver, "resolve")
     def test_notifications(
             self, mock_query, mock_getaddrinfo, mock_g_gethostbyname):
         """Check notifications."""
@@ -224,7 +224,7 @@ class DNSBLTestCase(ModoTestCase):
 
     @mock.patch("gevent.socket.gethostbyname")
     @mock.patch("socket.getaddrinfo")
-    @mock.patch.object(dns.resolver.Resolver, "query")
+    @mock.patch.object(dns.resolver.Resolver, "resolve")
     def test_management_command_no_dnsbl(
             self, mock_query, mock_getaddrinfo, mock_g_gethostbyname):
         """Check that command works fine without dnsbl."""
@@ -251,7 +251,7 @@ class DNSChecksTestCase(ModoTestCase):
 
     @mock.patch("gevent.socket.gethostbyname")
     @mock.patch("socket.getaddrinfo")
-    @mock.patch.object(dns.resolver.Resolver, "query")
+    @mock.patch.object(dns.resolver.Resolver, "resolve")
     def test_management_command(
             self, mock_query, mock_getaddrinfo, mock_g_gethostbyname):
         """Check that command works fine."""
diff --git a/requirements.txt b/requirements.txt
index 3e11e010e..e7797fd6d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,7 +19,7 @@ drf-flex-fields
 passlib~=1.7.4
 bcrypt  # Requires libffi-dev and python-dev
 
-dnspython==1.16.0
+dnspython==2.1.0
 feedparser==6.0.8
 greenlet==0.4.17
 gevent==20.9.0