PYTHON-4324 Fix typing bugs and typos

Author: ShaneHarvey

pymongo/asynchronous/network.py

@@ -140,7 +140,8 @@ async def command(
     # Support CSOT
     applied_csot = False
     if client:
-        applied_csot = conn.apply_timeout(client, spec)
+        res = conn.apply_timeout(client, spec)
+        applied_csot = bool(res)
     _csot.apply_write_concern(spec, write_concern)
 
     if use_op_msg:
@@ -196,7 +197,7 @@ async def command(
             reply = None
             response_doc: _DocumentOut = {"ok": 1}
         else:
-            reply = await async_receive_message(conn, request_id, enable_pending=bool(applied_csot))
+            reply = await async_receive_message(conn, request_id, enable_pending=applied_csot)
             conn.more_to_come = reply.more_to_come
             unpacked_docs = reply.unpack_response(
                 codec_options=codec_options, user_fields=user_fields

pymongo/asynchronous/pool.py

@@ -194,7 +194,6 @@ def __init__(
 
     def mark_pending(self, nbytes: int) -> None:
         """Mark this connection as having a pending response."""
-        # TODO: add "if self.enable_pending:"
         self.pending_response = True
         self.pending_bytes = nbytes
         self.pending_deadline = time.monotonic() + 3  # 3 seconds timeout for pending response
@@ -204,7 +203,6 @@ async def complete_pending(self) -> None:
         if not self.pending_response:
             return
 
-        timeout: Optional[Union[float, int]]
         timeout = self.conn.gettimeout
         if _csot.get_timeout():
             deadline = min(_csot.get_deadline(), self.pending_deadline)
@@ -219,7 +217,7 @@ async def complete_pending(self) -> None:
             await self.receive_message(None, True)
         else:
             # In sync we need to track the bytes left for the message.
-            network_layer.receive_data(self.conn.get_conn, self.pending_byte, deadline)
+            network_layer.receive_data(self.conn, self.pending_bytes, deadline)
         self.pending_response = False
         self.pending_bytes = 0
         self.pending_deadline = 0.0

pymongo/message.py

@@ -1615,7 +1615,7 @@ def __init__(
         self.exhaust = exhaust
         self._pending_enabled = False
 
-    def pending_enabled(self):
+    def pending_enabled(self) -> bool:
         return self._pending_enabled
 
     def reset(self) -> None:
@@ -1789,7 +1789,7 @@ def __init__(
         self.comment = comment
         self._pending_enabled = False
 
-    def pending_enabled(self):
+    def pending_enabled(self) -> bool:
         return self._pending_enabled
 
     def reset(self) -> None:

pymongo/network_layer.py

@@ -784,7 +784,7 @@ def receive_message(
         op_code, _, compressor_id = _UNPACK_COMPRESSION_HEADER(
             receive_data(conn, 9, deadline, enable_pending)
         )
-        data = decompress(receive_data(conn, length - 25, deadline), compressor_id, enable_pending)
+        data = decompress(receive_data(conn, length - 25, deadline, enable_pending), compressor_id)
     else:
         data = receive_data(conn, length - 16, deadline, enable_pending)
 

pymongo/synchronous/network.py

@@ -140,7 +140,8 @@ def command(
     # Support CSOT
     applied_csot = False
     if client:
-        applied_csot = conn.apply_timeout(client, spec)
+        res = conn.apply_timeout(client, spec)
+        applied_csot = bool(res)
     _csot.apply_write_concern(spec, write_concern)
 
     if use_op_msg:
@@ -196,7 +197,7 @@ def command(
             reply = None
             response_doc: _DocumentOut = {"ok": 1}
         else:
-            reply = receive_message(conn, request_id, enable_pending=bool(applied_csot))
+            reply = receive_message(conn, request_id, enable_pending=applied_csot)
             conn.more_to_come = reply.more_to_come
             unpacked_docs = reply.unpack_response(
                 codec_options=codec_options, user_fields=user_fields

pymongo/synchronous/pool.py

@@ -194,7 +194,6 @@ def __init__(
 
     def mark_pending(self, nbytes: int) -> None:
         """Mark this connection as having a pending response."""
-        # TODO: add "if self.enable_pending:"
         self.pending_response = True
         self.pending_bytes = nbytes
         self.pending_deadline = time.monotonic() + 3  # 3 seconds timeout for pending response
@@ -204,7 +203,6 @@ def complete_pending(self) -> None:
         if not self.pending_response:
             return
 
-        timeout: Optional[Union[float, int]]
         timeout = self.conn.gettimeout
         if _csot.get_timeout():
             deadline = min(_csot.get_deadline(), self.pending_deadline)
@@ -219,7 +217,7 @@ def complete_pending(self) -> None:
             self.receive_message(None, True)
         else:
             # In sync we need to track the bytes left for the message.
-            network_layer.receive_data(self.conn.get_conn, self.pending_byte, deadline)
+            network_layer.receive_data(self.conn, self.pending_bytes, deadline)
         self.pending_response = False
         self.pending_bytes = 0
         self.pending_deadline = 0.0

test/asynchronous/test_client.py

@@ -2222,7 +2222,7 @@ async def test_exhaust_getmore_server_error(self):
         await cursor.next()
 
         # Cause a server error on getmore.
-        async def receive_message(request_id):
+        async def receive_message(request_id, enable_pending=False):
             # Discard the actual server response.
             await AsyncConnection.receive_message(conn, request_id)
 

test/test_client.py

@@ -2179,7 +2179,7 @@ def test_exhaust_getmore_server_error(self):
         cursor.next()
 
         # Cause a server error on getmore.
-        def receive_message(request_id):
+        def receive_message(request_id, enable_pending=False):
             # Discard the actual server response.
             Connection.receive_message(conn, request_id)