Skip to content

Commit 0d14d9d

Browse files
committed
PYTHON-5544 Revert changes to base protocol layer
1 parent e133d88 commit 0d14d9d

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

pymongo/asynchronous/encryption.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ async def kms_request(self, kms_context: MongoCryptKmsContext) -> None:
202202
while kms_context.bytes_needed > 0:
203203
# CSOT: update timeout.
204204
conn.settimeout(max(_csot.clamp_remaining(_KMS_CONNECT_TIMEOUT), 0))
205+
data: memoryview | bytes
205206
if _IS_SYNC:
206207
data = conn.recv(kms_context.bytes_needed)
207208
else:

pymongo/network_layer.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def _is_ready(fut: Future[Any]) -> None:
103103

104104
while sent < len(buf):
105105
try:
106-
sent += sock.send(view[sent:])
106+
sent += sock.send(view[sent:]) # type:ignore[arg-type]
107107
except BLOCKING_IO_ERRORS as exc:
108108
fd = sock.fileno()
109109
# Check for closed socket.
@@ -465,7 +465,7 @@ def sock(self) -> Union[socket.socket, _sslConn]:
465465
def fileno(self) -> int:
466466
return self.conn.fileno()
467467

468-
def recv_into(self, buffer: bytes) -> int:
468+
def recv_into(self, buffer: bytes | memoryview) -> int:
469469
return self.conn.recv_into(buffer)
470470

471471

@@ -770,6 +770,7 @@ def receive_message(
770770
f"Message length ({length!r}) is larger than server max "
771771
f"message size ({max_message_size!r})"
772772
)
773+
data: memoryview | bytes
773774
if op_code == 2012:
774775
op_code, _, compressor_id = _UNPACK_COMPRESSION_HEADER(receive_data(conn, 9, deadline))
775776
data = decompress(receive_data(conn, length - 25, deadline), compressor_id)

pymongo/synchronous/encryption.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ def kms_request(self, kms_context: MongoCryptKmsContext) -> None:
201201
while kms_context.bytes_needed > 0:
202202
# CSOT: update timeout.
203203
conn.settimeout(max(_csot.clamp_remaining(_KMS_CONNECT_TIMEOUT), 0))
204+
data: memoryview | bytes
204205
if _IS_SYNC:
205206
data = conn.recv(kms_context.bytes_needed)
206207
else:

0 commit comments

Comments
 (0)