remove eventlet and dnspython 1.0 support

Author: blink1073

.evergreen/scripts/run_tests.py

@@ -46,16 +46,12 @@ def handle_perf(start_time: datetime):
 
 
 def handle_green_framework() -> None:
-    if GREEN_FRAMEWORK == "eventlet":
-        import eventlet
-
-        # https://github.com/eventlet/eventlet/issues/401
-        eventlet.sleep()
-        eventlet.monkey_patch()
-    elif GREEN_FRAMEWORK == "gevent":
+    if GREEN_FRAMEWORK == "gevent":
         from gevent import monkey
 
         monkey.patch_all()
+    else:
+        raise ValueError(f"Unsupported green framework type: {GREEN_FRAMEWORK}")
 
     # Never run async tests with a framework.
     if len(TEST_ARGS) <= 1:

.evergreen/scripts/utils.py

@@ -106,7 +106,7 @@ def get_test_options(
         parser.add_argument(
             "--green-framework",
             nargs=1,
-            choices=["eventlet", "gevent"],
+            choices=["gevent"],
             help="Optional green framework to test against.",
         )
         parser.add_argument(

pymongo/asynchronous/pool.py

@@ -629,7 +629,7 @@ async def _raise_connection_failure(self, error: BaseException) -> NoReturn:
         # signals and throws KeyboardInterrupt into the current frame on the
         # main thread.
         #
-        # But in Gevent and Eventlet, the polling mechanism (epoll, kqueue,
+        # But in Gevent the polling mechanism (epoll, kqueue,
         # ..) is called in Python code, which experiences the signal as a
         # KeyboardInterrupt from the start, rather than as an initial
         # socket.error, so we catch that, close the socket, and reraise it.

pymongo/asynchronous/srv_resolver.py

@@ -45,25 +45,15 @@ def maybe_decode(text: Union[str, bytes]) -> str:
     return text
 
 
-# PYTHON-2667 Lazily call dns.resolver methods for compatibility with eventlet.
 async def _resolve(*args: Any, **kwargs: Any) -> resolver.Answer:
     if _IS_SYNC:
         from dns import resolver
 
-        if hasattr(resolver, "resolve"):
-            # dnspython >= 2
-            return resolver.resolve(*args, **kwargs)
-        # dnspython 1.X
-        return resolver.query(*args, **kwargs)
+        return resolver.resolve(*args, **kwargs)
     else:
         from dns import asyncresolver
 
-        if hasattr(asyncresolver, "resolve"):
-            # dnspython >= 2
-            return await asyncresolver.resolve(*args, **kwargs)  # type:ignore[return-value]
-        raise ConfigurationError(
-            "Upgrade to dnspython version >= 2.0 to use AsyncMongoClient with mongodb+srv:// connections."
-        )
+        return await asyncresolver.resolve(*args, **kwargs)  # type:ignore[return-value]
 
 
 _INVALID_HOST_MSG = (

pymongo/pool_shared.py

@@ -139,12 +139,6 @@ def _raise_connection_failure(
         msg += format_timeout_details(timeout_details)
     if isinstance(error, socket.timeout):
         raise NetworkTimeout(msg) from error
-    elif isinstance(error, SSLErrors) and "timed out" in str(error):
-        # Eventlet does not distinguish TLS network timeouts from other
-        # SSLErrors (https://github.com/eventlet/eventlet/issues/692).
-        # Luckily, we can work around this limitation because the phrase
-        # 'timed out' appears in all the timeout related SSLErrors raised.
-        raise NetworkTimeout(msg) from error
     else:
         raise AutoReconnect(msg) from error
 

pymongo/synchronous/pool.py

@@ -627,7 +627,7 @@ def _raise_connection_failure(self, error: BaseException) -> NoReturn:
         # signals and throws KeyboardInterrupt into the current frame on the
         # main thread.
         #
-        # But in Gevent and Eventlet, the polling mechanism (epoll, kqueue,
+        # But in Gevent the polling mechanism (epoll, kqueue,
         # ..) is called in Python code, which experiences the signal as a
         # KeyboardInterrupt from the start, rather than as an initial
         # socket.error, so we catch that, close the socket, and reraise it.

pymongo/synchronous/srv_resolver.py

@@ -45,25 +45,15 @@ def maybe_decode(text: Union[str, bytes]) -> str:
     return text
 
 
-# PYTHON-2667 Lazily call dns.resolver methods for compatibility with eventlet.
 def _resolve(*args: Any, **kwargs: Any) -> resolver.Answer:
     if _IS_SYNC:
         from dns import resolver
 
-        if hasattr(resolver, "resolve"):
-            # dnspython >= 2
-            return resolver.resolve(*args, **kwargs)
-        # dnspython 1.X
-        return resolver.query(*args, **kwargs)
+        return resolver.resolve(*args, **kwargs)
     else:
         from dns import asyncresolver
 
-        if hasattr(asyncresolver, "resolve"):
-            # dnspython >= 2
-            return asyncresolver.resolve(*args, **kwargs)  # type:ignore[return-value]
-        raise ConfigurationError(
-            "Upgrade to dnspython version >= 2.0 to use MongoClient with mongodb+srv:// connections."
-        )
+        return asyncresolver.resolve(*args, **kwargs)  # type:ignore[return-value]
 
 
 _INVALID_HOST_MSG = (

pyproject.toml

@@ -52,7 +52,6 @@ dev = [
 doctest = ["sphinx"]
 pip = ["pip"]
 gevent = ["gevent"]
-eventlet = ["eventlet"]
 coverage = [
     "pytest-cov",
     "coverage>=5,<=7.5"
@@ -116,15 +115,12 @@ filterwarnings = [
     "module:.*WindowsSelectorEventLoopPolicy:DeprecationWarning",
     "module:.*et_event_loop_policy:DeprecationWarning",
     # TODO: Remove as part of PYTHON-3923.
-    "module:unclosed <eventlet.green.ssl.GreenSSLSocket:ResourceWarning",
     "module:unclosed <socket.socket:ResourceWarning",
     "module:unclosed <ssl.SSLSocket:ResourceWarning",
     "module:unclosed <socket object:ResourceWarning",
     "module:unclosed transport:ResourceWarning",
     # pytest-asyncio known issue: https://github.com/pytest-dev/pytest-asyncio/issues/724
     "module:unclosed event loop:ResourceWarning",
-    # https://github.com/eventlet/eventlet/issues/818
-    "module:please use dns.resolver.Resolver.resolve:DeprecationWarning",
     # https://github.com/dateutil/dateutil/issues/1314
     "module:datetime.datetime.utc:DeprecationWarning",
 ]

requirements.txt

@@ -1 +1 @@
-dnspython>=1.16.0,<3.0.0
+dnspython>=2.6.0,<3.0.0

test/asynchronous/test_encryption.py

@@ -395,7 +395,7 @@ async def test_use_after_close(self):
     )
     @unittest.skipIf(
         is_greenthread_patched(),
-        "gevent and eventlet do not support POSIX-style forking.",
+        "gevent does not support POSIX-style forking.",
     )
     @async_client_context.require_sync
     async def test_fork(self):