[Greendns] Replace deprecated resolver.query by resolver.resolve

Usages of `resolver.query` are deprecated[1][2][3] and should
be replaced by `resolver.resolve`.

Fix eventlet#818

[1] https://dnspython.readthedocs.io/en/latest/whatsnew.html#id8
[2] https://github.com/rthalley/dnspython/blob/adfc942725bd36d28ec53f7e5480ace9eb543bd8/dns/resolver.py#L1360
[3] https://github.com/rthalley/dnspython/blob/adfc942725bd36d28ec53f7e5480ace9eb543bd8/dns/resolver.py#L1596

eventlet/support/greendns.py

@@ -395,12 +395,12 @@ def end():
             raise dns.resolver.NXDOMAIN(qnames=(qname,))
 
         if (self._hosts and (rdclass == dns.rdataclass.IN) and (rdtype in _hosts_rdtypes)):
-            if step(self._hosts.query, qname, rdtype, raise_on_no_answer=False):
+            if step(self._hosts.resolve, qname, rdtype, raise_on_no_answer=False):
                 if (result[0] is not None) or (result[1] is not None) or (not use_network):
                     return end()
 
         # Main query
-        step(self._resolver.query, qname, rdtype, rdclass, tcp, source, raise_on_no_answer=False)
+        step(self._resolver.resolve, qname, rdtype, rdclass, tcp, source, raise_on_no_answer=False)
 
         # `resolv.conf` docs say unqualified names must resolve from search (or local) domain.
         # However, common OS `getaddrinfo()` implementations append trailing dot (e.g. `db -> db.`)
@@ -409,7 +409,7 @@ def end():
         # https://github.com/nameko/nameko/issues/392
         # https://github.com/eventlet/eventlet/issues/363
         if len(qname) == 1:
-            step(self._resolver.query, qname.concatenate(dns.name.root),
+            step(self._resolver.resolve, qname.concatenate(dns.name.root),
                  rdtype, rdclass, tcp, source, raise_on_no_answer=False)
 
         return end()
@@ -422,7 +422,7 @@ def getaliases(self, hostname):
             aliases = []
         while True:
             try:
-                ans = self._resolver.query(hostname, dns.rdatatype.CNAME)
+                ans = self._resolver.resolve(hostname, dns.rdatatype.CNAME)
             except (dns.resolver.NoAnswer, dns.resolver.NXDOMAIN):
                 break
             else:
@@ -456,8 +456,8 @@ def resolve(name, family=socket.AF_INET, raises=True, _proxy=None,
         _proxy = resolver
     try:
         try:
-            return _proxy.query(name, rdtype, raise_on_no_answer=raises,
-                                use_network=use_network)
+            return _proxy.resolve(name, rdtype, raise_on_no_answer=raises,
+                                  use_network=use_network)
         except dns.resolver.NXDOMAIN:
             if not raises:
                 return HostsAnswer(dns.name.Name(name),
@@ -472,7 +472,7 @@ def resolve(name, family=socket.AF_INET, raises=True, _proxy=None,
 def resolve_cname(host):
     """Return the canonical name of a hostname"""
     try:
-        ans = resolver.query(host, dns.rdatatype.CNAME)
+        ans = resolver.resolve(host, dns.rdatatype.CNAME)
     except dns.resolver.NoAnswer:
         return host
     except dns.exception.Timeout:
@@ -623,7 +623,7 @@ def getnameinfo(sockaddr, flags):
 
     if is_ipv4_addr(host):
         try:
-            rrset = resolver.query(
+            rrset = resolver.resolve(
                 dns.reversename.from_address(host), dns.rdatatype.PTR)
             if len(rrset) > 1:
                 raise socket.error('sockaddr resolved to multiple addresses')
@@ -636,7 +636,7 @@ def getnameinfo(sockaddr, flags):
                 raise EAI_NONAME_ERROR
     else:
         try:
-            rrset = resolver.query(host)
+            rrset = resolver.resolve(host)
             if len(rrset) > 1:
                 raise socket.error('sockaddr resolved to multiple addresses')
             if flags & socket.NI_NUMERICHOST:
@@ -655,7 +655,7 @@ def getnameinfo(sockaddr, flags):
 
 
 def _net_read(sock, count, expiration):
-    """coro friendly replacement for dns.query._net_read
+    """coro friendly replacement for dns.resolve._net_read
     Read the specified number of bytes from sock.  Keep trying until we
     either get the desired amount, or we hit EOF.
     A Timeout exception will be raised if the operation is not completed