Skip to content

PYTHON-2667 Fix SRV support when running with eventlet #612

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 1 commit into from
Apr 28, 2021
Merged

PYTHON-2667 Fix SRV support when running with eventlet #612

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions pymongo/srv_resolver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@

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 All @@ -39,6 +32,15 @@ def maybe_decode(text):
return text


# PYTHON-2667 Lazily call dns.resolver methods for compatibility with eventlet.
def _resolve(*args, **kwargs):
if hasattr(resolver, 'resolve'):
# dnspython >= 2
return resolver.resolve(*args, **kwargs)
# dnspython 1.X
return resolver.query(*args, **kwargs)


class _SrvResolver(object):
def __init__(self, fqdn, connect_timeout=None):
self.__fqdn = fqdn
Expand Down