cleanup

Author: blink1073

pymongo/asynchronous/encryption.py

@@ -80,7 +80,6 @@
 from pymongo.operations import UpdateOne
 from pymongo.pool_options import PoolOptions
 from pymongo.pool_shared import (
-    _async_configured_socket,
     _configured_protocol_interface,
     _get_timeout_details,
     _raise_connection_failure,
@@ -95,9 +94,6 @@
 if TYPE_CHECKING:
     from pymongocrypt.mongocrypt import MongoCryptKmsContext
 
-    from pymongo.pyopenssl_context import _sslConn
-    from pymongo.typings import _Address
-
 
 _IS_SYNC = False
 
@@ -113,13 +109,6 @@
 _KEY_VAULT_OPTS = CodecOptions(document_class=RawBSONDocument)
 
 
-async def _connect_kms(address: _Address, opts: PoolOptions) -> Union[socket.socket, _sslConn]:
-    try:
-        return await _async_configured_socket(address, opts)
-    except Exception as exc:
-        _raise_connection_failure(address, exc, timeout_details=_get_timeout_details(opts))
-
-
 @contextlib.contextmanager
 def _wrap_encryption_errors() -> Iterator[None]:
     """Context manager to wrap encryption related errors."""
@@ -200,7 +189,6 @@ async def kms_request(self, kms_context: MongoCryptKmsContext) -> None:
         try:
             interface = await _configured_protocol_interface(address, opts)
             conn = AsyncBaseConnection(interface, opts)
-            # Given a conn object, we want to send a message and then receive the bytes needed
             try:
                 await async_sendall(interface.get_conn, message)
                 interface.settimeout(max(_csot.clamp_remaining(_KMS_CONNECT_TIMEOUT), 0))

pymongo/synchronous/encryption.py

@@ -74,7 +74,6 @@
 from pymongo.operations import UpdateOne
 from pymongo.pool_options import PoolOptions
 from pymongo.pool_shared import (
-    _configured_socket,
     _configured_socket_interface,
     _get_timeout_details,
     _raise_connection_failure,
@@ -94,9 +93,6 @@
 if TYPE_CHECKING:
     from pymongocrypt.mongocrypt import MongoCryptKmsContext
 
-    from pymongo.pyopenssl_context import _sslConn
-    from pymongo.typings import _Address
-
 
 _IS_SYNC = True
 
@@ -112,13 +108,6 @@
 _KEY_VAULT_OPTS = CodecOptions(document_class=RawBSONDocument)
 
 
-def _connect_kms(address: _Address, opts: PoolOptions) -> Union[socket.socket, _sslConn]:
-    try:
-        return _configured_socket(address, opts)
-    except Exception as exc:
-        _raise_connection_failure(address, exc, timeout_details=_get_timeout_details(opts))
-
-
 @contextlib.contextmanager
 def _wrap_encryption_errors() -> Iterator[None]:
     """Context manager to wrap encryption related errors."""
@@ -199,7 +188,6 @@ def kms_request(self, kms_context: MongoCryptKmsContext) -> None:
         try:
             interface = _configured_socket_interface(address, opts)
             conn = BaseConnection(interface, opts)
-            # Given a conn object, we want to send a message and then receive the bytes needed
             try:
                 sendall(interface.get_conn, message)
                 interface.settimeout(max(_csot.clamp_remaining(_KMS_CONNECT_TIMEOUT), 0))