PYTHON-4324 Fix NetworkingInterface.gettimeout

Author: ShaneHarvey

pymongo/asynchronous/pool.py

@@ -203,21 +203,22 @@ async def complete_pending(self) -> None:
         if not self.pending_response:
             return
 
-        timeout = self.conn.gettimeout
         if _csot.get_timeout():
             deadline = min(_csot.get_deadline(), self.pending_deadline)
-        elif timeout is not None:
-            deadline = min(time.monotonic() + timeout, self.pending_deadline)
         else:
-            deadline = self.pending_deadline
+            timeout = self.conn.gettimeout
+            if timeout is not None:
+                deadline = min(time.monotonic() + timeout, self.pending_deadline)
+            else:
+                deadline = self.pending_deadline
 
         if not _IS_SYNC:
             # In async the reader task reads the whole message at once.
             # TODO: respect deadline
             await self.receive_message(None, True)
         else:
             try:
-                network_layer.receive_data(self, self.pending_bytes, deadline)  # type:ignore[call-arg]
+                network_layer.receive_data(self, self.pending_bytes, deadline)  # type:ignore[arg-type]
             except BaseException as error:
                 await self._raise_connection_failure(error)
         self.pending_response = False

pymongo/network_layer.py

@@ -338,7 +338,7 @@ def receive_data(
     # When the timeout has expired we perform one final non-blocking recv.
     # This helps avoid spurious timeouts when the response is actually already
     # buffered on the client.
-    orig_timeout = conn.conn.gettimeout()
+    orig_timeout = conn.conn.gettimeout
     try:
         while bytes_read < length:
             try:
@@ -444,6 +444,7 @@ class NetworkingInterface(NetworkingInterfaceBase):
     def __init__(self, conn: Union[socket.socket, _sslConn]):
         super().__init__(conn)
 
+    @property
     def gettimeout(self) -> float | None:
         return self.conn.gettimeout()
 
@@ -758,7 +759,7 @@ def receive_message(
     if _csot.get_timeout():
         deadline = _csot.get_deadline()
     else:
-        timeout = conn.conn.gettimeout()
+        timeout = conn.conn.gettimeout
         if timeout:
             deadline = time.monotonic() + timeout
         else:

pymongo/synchronous/pool.py

@@ -203,21 +203,22 @@ def complete_pending(self) -> None:
         if not self.pending_response:
             return
 
-        timeout = self.conn.gettimeout
         if _csot.get_timeout():
             deadline = min(_csot.get_deadline(), self.pending_deadline)
-        elif timeout is not None:
-            deadline = min(time.monotonic() + timeout, self.pending_deadline)
         else:
-            deadline = self.pending_deadline
+            timeout = self.conn.gettimeout
+            if timeout is not None:
+                deadline = min(time.monotonic() + timeout, self.pending_deadline)
+            else:
+                deadline = self.pending_deadline
 
         if not _IS_SYNC:
             # In async the reader task reads the whole message at once.
             # TODO: respect deadline
             self.receive_message(None, True)
         else:
             try:
-                network_layer.receive_data(self, self.pending_bytes, deadline)  # type:ignore[call-arg]
+                network_layer.receive_data(self, self.pending_bytes, deadline)  # type:ignore[arg-type]
             except BaseException as error:
                 self._raise_connection_failure(error)
         self.pending_response = False