Revert back to using the default executor

Author: NoahStapp

pymongo/_asyncio_executor.py

@@ -17,7 +17,6 @@
 
 import asyncio
 import builtins
-import functools
 import socket
 import sys
 from typing import (
@@ -27,7 +26,6 @@
     cast,
 )
 
-from pymongo._asyncio_executor import _PYMONGO_EXECUTOR
 from pymongo.errors import (
     OperationFailure,
 )
@@ -85,9 +83,7 @@ async def getaddrinfo(
 ]:
     if not _IS_SYNC:
         loop = asyncio.get_running_loop()
-        return await loop.run_in_executor(  # type: ignore[return-value]
-            _PYMONGO_EXECUTOR, functools.partial(socket.getaddrinfo, host, port, **kwargs)
-        )
+        return await loop.getaddrinfo(host, port, **kwargs)  # type: ignore[return-value]
     else:
         return socket.getaddrinfo(host, port, **kwargs)
 

pymongo/asynchronous/helpers.py

@@ -39,7 +39,6 @@
 
 from bson import DEFAULT_CODEC_OPTIONS
 from pymongo import _csot, helpers_shared
-from pymongo._asyncio_executor import _PYMONGO_EXECUTOR
 from pymongo.asynchronous.client_session import _validate_session_write_concern
 from pymongo.asynchronous.helpers import _handle_reauth, getaddrinfo
 from pymongo.asynchronous.network import command, receive_message
@@ -884,7 +883,7 @@ async def _configured_socket(
                 else:
                     loop = asyncio.get_running_loop()
                     ssl_sock = await loop.run_in_executor(
-                        _PYMONGO_EXECUTOR,
+                        None,
                         functools.partial(ssl_context.wrap_socket, sock, server_hostname=host),  # type: ignore[assignment, misc]
                     )
         else:
@@ -895,9 +894,7 @@ async def _configured_socket(
                     ssl_sock = await ssl_context.a_wrap_socket(sock)  # type: ignore[assignment, misc]
                 else:
                     loop = asyncio.get_running_loop()
-                    ssl_sock = await loop.run_in_executor(
-                        _PYMONGO_EXECUTOR, ssl_context.wrap_socket, sock
-                    )  # type: ignore[assignment, misc]
+                    ssl_sock = await loop.run_in_executor(None, ssl_context.wrap_socket, sock)  # type: ignore[assignment, misc]
     except _CertificateError:
         sock.close()
         # Raise _CertificateError directly like we do after match_hostname

pymongo/asynchronous/pool.py

@@ -31,7 +31,6 @@
 from OpenSSL import SSL as _SSL
 from OpenSSL import crypto as _crypto
 
-from pymongo._asyncio_executor import _PYMONGO_EXECUTOR
 from pymongo.errors import ConfigurationError as _ConfigurationError
 from pymongo.errors import _CertificateError  # type:ignore[attr-defined]
 from pymongo.ocsp_cache import _OCSPCache
@@ -406,15 +405,15 @@ async def a_wrap_socket(
                 ssl_conn.set_tlsext_host_name(server_hostname.encode("idna"))
             if self.verify_mode != _stdlibssl.CERT_NONE:
                 # Request a stapled OCSP response.
-                await loop.run_in_executor(_PYMONGO_EXECUTOR, ssl_conn.request_ocsp)
+                await loop.run_in_executor(None, ssl_conn.request_ocsp)
             ssl_conn.set_connect_state()
         # If this wasn't true the caller of wrap_socket would call
         # do_handshake()
         if do_handshake_on_connect:
             # XXX: If we do hostname checking in a callback we can get rid
             # of this call to do_handshake() since the handshake
             # will happen automatically later.
-            await loop.run_in_executor(_PYMONGO_EXECUTOR, ssl_conn.do_handshake)
+            await loop.run_in_executor(None, ssl_conn.do_handshake)
             # XXX: Do this in a callback registered with
             # SSLContext.set_info_callback? See Twisted for an example.
             if self.check_hostname and server_hostname is not None:

pymongo/pyopenssl_context.py

@@ -17,7 +17,6 @@
 
 import asyncio
 import builtins
-import functools
 import socket
 import sys
 from typing import (
@@ -27,7 +26,6 @@
     cast,
 )
 
-from pymongo._asyncio_executor import _PYMONGO_EXECUTOR
 from pymongo.errors import (
     OperationFailure,
 )
@@ -85,9 +83,7 @@ def getaddrinfo(
 ]:
     if not _IS_SYNC:
         loop = asyncio.get_running_loop()
-        return loop.run_in_executor(  # type: ignore[return-value]
-            _PYMONGO_EXECUTOR, functools.partial(socket.getaddrinfo, host, port, **kwargs)
-        )
+        return loop.getaddrinfo(host, port, **kwargs)  # type: ignore[return-value]
     else:
         return socket.getaddrinfo(host, port, **kwargs)
 

pymongo/synchronous/helpers.py

@@ -39,7 +39,6 @@
 
 from bson import DEFAULT_CODEC_OPTIONS
 from pymongo import _csot, helpers_shared
-from pymongo._asyncio_executor import _PYMONGO_EXECUTOR
 from pymongo.common import (
     MAX_BSON_SIZE,
     MAX_MESSAGE_SIZE,
@@ -880,7 +879,7 @@ def _configured_socket(address: _Address, options: PoolOptions) -> Union[socket.
                 else:
                     loop = asyncio.get_running_loop()
                     ssl_sock = loop.run_in_executor(
-                        _PYMONGO_EXECUTOR,
+                        None,
                         functools.partial(ssl_context.wrap_socket, sock, server_hostname=host),  # type: ignore[assignment, misc]
                     )
         else:
@@ -891,9 +890,7 @@ def _configured_socket(address: _Address, options: PoolOptions) -> Union[socket.
                     ssl_sock = ssl_context.a_wrap_socket(sock)  # type: ignore[assignment, misc]
                 else:
                     loop = asyncio.get_running_loop()
-                    ssl_sock = loop.run_in_executor(
-                        _PYMONGO_EXECUTOR, ssl_context.wrap_socket, sock
-                    )  # type: ignore[assignment, misc]
+                    ssl_sock = loop.run_in_executor(None, ssl_context.wrap_socket, sock)  # type: ignore[assignment, misc]
     except _CertificateError:
         sock.close()
         # Raise _CertificateError directly like we do after match_hostname