Skip to content

PYTHON-2364 Replace deprecated dns.resolver.query with dns.resolver.resolve #598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 23, 2021
Merged

PYTHON-2364 Replace deprecated dns.resolver.query with dns.resolver.resolve #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2c944f
replace deprecated dns.resolver.query with dns.resolver.resolve
janosh Apr 22, 2021
a166752
fall back on query in dns.resolver.resolve import for dns v1 compat
janosh Apr 22, 2021
01cf1a7
fix indentation + test_connection_timeout_ms_propagates_to_DNS_resolver
janosh Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions pymongo/srv_resolver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@

try:
from dns import resolver

try:
# dnspython >= 2
from dns.resolver import resolve as _resolve
except ImportError:
# dnspython 1.X
from dns.resolver import query as _resolve
_HAVE_DNSPYTHON = True
except ImportError:
_HAVE_DNSPYTHON = False
Expand Down Expand Up @@ -48,8 +55,8 @@ def __init__(self, fqdn, connect_timeout=None):

def get_options(self):
try:
results = resolver.query(self.__fqdn, 'TXT',
lifetime=self.__connect_timeout)
results = _resolve(self.__fqdn, 'TXT',
lifetime=self.__connect_timeout)
except (resolver.NoAnswer, resolver.NXDOMAIN):
# No TXT records
return None
Expand All @@ -63,8 +70,8 @@ def get_options(self):

def _resolve_uri(self, encapsulate_errors):
try:
results = resolver.query('_mongodb._tcp.' + self.__fqdn, 'SRV',
lifetime=self.__connect_timeout)
results = _resolve('_mongodb._tcp.' + self.__fqdn, 'SRV',
lifetime=self.__connect_timeout)
except Exception as exc:
if not encapsulate_errors:
# Raise the original error.
Expand Down
8 changes: 4 additions & 4 deletions test/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,11 +392,11 @@ def test_uri_option_precedence(self):
_HAVE_DNSPYTHON, "DNS-related tests need dnspython to be installed")
def test_connection_timeout_ms_propagates_to_DNS_resolver(self):
# Patch the resolver.
from pymongo.srv_resolver import resolver
patched_resolver = FunctionCallRecorder(resolver.query)
pymongo.srv_resolver.resolver.query = patched_resolver
from pymongo.srv_resolver import _resolve
patched_resolver = FunctionCallRecorder(_resolve)
pymongo.srv_resolver._resolve = patched_resolver
def reset_resolver():
pymongo.srv_resolver.resolver.query = resolver.query
pymongo.srv_resolver._resolve = _resolve
self.addCleanup(reset_resolver)

# Setup.
Expand Down