Remove property decorators

Author: NoahStapp

pymongo/asynchronous/client_bulk.py

@@ -537,7 +537,7 @@ async def _execute_command(
                     session._start_retryable_write()
                     self.started_retryable_write = True
                 session._apply_to(cmd, retryable, ReadPreference.PRIMARY, conn)
-                session.leave_alive = True
+                session._leave_alive = True
             conn.send_cluster_time(cmd, session, self.client)
             conn.add_server_api(cmd)
             # CSOT: apply timeout before encoding the command.

pymongo/asynchronous/client_session.py

@@ -513,7 +513,9 @@ def __init__(
         # Is this an implicitly created session?
         self._implicit = implicit
         self._transaction = _Transaction(None, client)
+        # Is this session attached to a cursor?
         self._attached_to_cursor = False
+        # Should we leave the session alive when the cursor is closed?
         self._leave_alive = False
 
     async def end_session(self) -> None:
@@ -590,32 +592,6 @@ def operation_time(self) -> Optional[Timestamp]:
         """
         return self._operation_time
 
-    @property
-    def _is_implicit(self) -> bool:
-        """Whether this session was implicitly created by the driver."""
-        return self._implicit
-
-    @property
-    def _is_attached_to_cursor(self) -> bool:
-        """Whether this session is owned by a cursor."""
-        return self._attached_to_cursor
-
-    @_is_attached_to_cursor.setter
-    def _is_attached_to_cursor(self, value: bool) -> None:
-        self._attached_to_cursor = value
-
-    @property
-    def leave_alive(self) -> bool:
-        """Whether to leave this session alive when it is
-        no longer in use.
-        Typically used for implicit sessions that are used for multiple operations within a single larger operation.
-        """
-        return self._leave_alive
-
-    @leave_alive.setter
-    def leave_alive(self, value: bool) -> None:
-        self._leave_alive = value
-
     def _inherit_option(self, name: str, val: _T) -> _T:
         """Return the inherited TransactionOption value."""
         if val:

pymongo/asynchronous/command_cursor.py

@@ -80,7 +80,7 @@ def __init__(
         self._timeout = self._collection.database.client.options.timeout
         self._session = session
         if self._session is not None:
-            self._session._is_attached_to_cursor = True
+            self._session._attached_to_cursor = True
         self._killed = self._id == 0
         self._comment = comment
         if self._killed:
@@ -197,7 +197,7 @@ def session(self) -> Optional[AsyncClientSession]:
 
         .. versionadded:: 3.6
         """
-        if self._session and not self._session._is_implicit:
+        if self._session and not self._session._implicit:
             return self._session
         return None
 
@@ -220,8 +220,8 @@ def _die_no_lock(self) -> None:
         self._collection.database.client._cleanup_cursor_no_lock(
             cursor_id, address, self._sock_mgr, self._session
         )
-        if self._session and self._session._is_implicit:
-            self._session._is_attached_to_cursor = False
+        if self._session and self._session._implicit:
+            self._session._attached_to_cursor = False
             self._session = None
         self._sock_mgr = None
 
@@ -234,14 +234,14 @@ async def _die_lock(self) -> None:
             self._sock_mgr,
             self._session,
         )
-        if self._session and self._session._is_implicit:
-            self._session._is_attached_to_cursor = False
+        if self._session and self._session._implicit:
+            self._session._attached_to_cursor = False
             self._session = None
         self._sock_mgr = None
 
     def _end_session(self) -> None:
-        if self._session and self._session._is_implicit and not self._session.leave_alive:
-            self._session._is_attached_to_cursor = False
+        if self._session and self._session._implicit and not self._session._leave_alive:
+            self._session._attached_to_cursor = False
             self._session._end_implicit_session()
             self._session = None
 

pymongo/asynchronous/cursor.py

@@ -138,7 +138,7 @@ def __init__(
 
         if session:
             self._session = session
-            self._session._is_attached_to_cursor = True
+            self._session._attached_to_cursor = True
         else:
             self._session = None
 
@@ -149,7 +149,7 @@ def __init__(
         if not isinstance(limit, int):
             raise TypeError(f"limit must be an instance of int, not {type(limit)}")
         validate_boolean("no_cursor_timeout", no_cursor_timeout)
-        if no_cursor_timeout and self._session and self._session._is_implicit:
+        if no_cursor_timeout and self._session and self._session._implicit:
             warnings.warn(
                 "use an explicit session with no_cursor_timeout=True "
                 "otherwise the cursor may still timeout after "
@@ -282,7 +282,7 @@ def clone(self) -> AsyncCursor[_DocumentType]:
     def _clone(self, deepcopy: bool = True, base: Optional[AsyncCursor] = None) -> AsyncCursor:  # type: ignore[type-arg]
         """Internal clone helper."""
         if not base:
-            if self._session and not self._session._is_implicit:
+            if self._session and not self._session._implicit:
                 base = self._clone_base(self._session)
             else:
                 base = self._clone_base(None)
@@ -944,7 +944,7 @@ def session(self) -> Optional[AsyncClientSession]:
 
         .. versionadded:: 3.6
         """
-        if self._session and not self._session._is_implicit:
+        if self._session and not self._session._implicit:
             return self._session
         return None
 
@@ -1035,8 +1035,8 @@ def _die_no_lock(self) -> None:
         self._collection.database.client._cleanup_cursor_no_lock(
             cursor_id, address, self._sock_mgr, self._session
         )
-        if self._session and self._session._is_implicit:
-            self._session._is_attached_to_cursor = False
+        if self._session and self._session._implicit:
+            self._session._attached_to_cursor = False
             self._session = None
         self._sock_mgr = None
 
@@ -1055,8 +1055,8 @@ async def _die_lock(self) -> None:
             self._sock_mgr,
             self._session,
         )
-        if self._session and self._session._is_implicit:
-            self._session._is_attached_to_cursor = False
+        if self._session and self._session._implicit:
+            self._session._attached_to_cursor = False
             self._session = None
         self._sock_mgr = None
 

pymongo/asynchronous/database.py

@@ -611,8 +611,8 @@ async def create_collection(
             common.validate_is_mapping("clusteredIndex", clustered_index)
 
         async with self._client._tmp_session(session) as s:
-            if s:
-                s.leave_alive = True
+            if s and not s.in_transaction:
+                s._leave_alive = True
             # Skip this check in a transaction where listCollections is not
             # supported.
             if (

pymongo/asynchronous/mongo_client.py

@@ -2106,7 +2106,7 @@ def _cleanup_cursor_no_lock(
         # The cursor will be closed later in a different session.
         if cursor_id or conn_mgr:
             self._close_cursor_soon(cursor_id, address, conn_mgr)
-        if session and session._is_implicit and not session.leave_alive:
+        if session and session._implicit and not session._leave_alive:
             session._end_implicit_session()
 
     async def _cleanup_cursor_lock(
@@ -2138,7 +2138,7 @@ async def _cleanup_cursor_lock(
                 await self._close_cursor_now(cursor_id, address, session=session, conn_mgr=conn_mgr)
         if conn_mgr:
             await conn_mgr.close()
-        if session and session._is_implicit and not session.leave_alive:
+        if session and session._implicit and not session._leave_alive:
             session._end_implicit_session()
 
     async def _close_cursor_now(
@@ -2289,7 +2289,7 @@ async def _tmp_session(
                 raise
             finally:
                 # Call end_session when we exit this scope.
-                if not s._is_attached_to_cursor:
+                if not s._attached_to_cursor:
                     await s.end_session()
         else:
             yield None

pymongo/synchronous/client_bulk.py

@@ -535,7 +535,7 @@ def _execute_command(
                     session._start_retryable_write()
                     self.started_retryable_write = True
                 session._apply_to(cmd, retryable, ReadPreference.PRIMARY, conn)
-                session.leave_alive = True
+                session._leave_alive = True
             conn.send_cluster_time(cmd, session, self.client)
             conn.add_server_api(cmd)
             # CSOT: apply timeout before encoding the command.

pymongo/synchronous/client_session.py

@@ -512,7 +512,9 @@ def __init__(
         # Is this an implicitly created session?
         self._implicit = implicit
         self._transaction = _Transaction(None, client)
+        # Is this session attached to a cursor?
         self._attached_to_cursor = False
+        # Should we leave the session alive when the cursor is closed?
         self._leave_alive = False
 
     def end_session(self) -> None:
@@ -589,32 +591,6 @@ def operation_time(self) -> Optional[Timestamp]:
         """
         return self._operation_time
 
-    @property
-    def _is_implicit(self) -> bool:
-        """Whether this session was implicitly created by the driver."""
-        return self._implicit
-
-    @property
-    def _is_attached_to_cursor(self) -> bool:
-        """Whether this session is owned by a cursor."""
-        return self._attached_to_cursor
-
-    @_is_attached_to_cursor.setter
-    def _is_attached_to_cursor(self, value: bool) -> None:
-        self._attached_to_cursor = value
-
-    @property
-    def leave_alive(self) -> bool:
-        """Whether to leave this session alive when it is
-        no longer in use.
-        Typically used for implicit sessions that are used for multiple operations within a single larger operation.
-        """
-        return self._leave_alive
-
-    @leave_alive.setter
-    def leave_alive(self, value: bool) -> None:
-        self._leave_alive = value
-
     def _inherit_option(self, name: str, val: _T) -> _T:
         """Return the inherited TransactionOption value."""
         if val:

pymongo/synchronous/command_cursor.py

@@ -80,7 +80,7 @@ def __init__(
         self._timeout = self._collection.database.client.options.timeout
         self._session = session
         if self._session is not None:
-            self._session._is_attached_to_cursor = True
+            self._session._attached_to_cursor = True
         self._killed = self._id == 0
         self._comment = comment
         if self._killed:
@@ -197,7 +197,7 @@ def session(self) -> Optional[ClientSession]:
 
         .. versionadded:: 3.6
         """
-        if self._session and not self._session._is_implicit:
+        if self._session and not self._session._implicit:
             return self._session
         return None
 
@@ -220,8 +220,8 @@ def _die_no_lock(self) -> None:
         self._collection.database.client._cleanup_cursor_no_lock(
             cursor_id, address, self._sock_mgr, self._session
         )
-        if self._session and self._session._is_implicit:
-            self._session._is_attached_to_cursor = False
+        if self._session and self._session._implicit:
+            self._session._attached_to_cursor = False
             self._session = None
         self._sock_mgr = None
 
@@ -234,14 +234,14 @@ def _die_lock(self) -> None:
             self._sock_mgr,
             self._session,
         )
-        if self._session and self._session._is_implicit:
-            self._session._is_attached_to_cursor = False
+        if self._session and self._session._implicit:
+            self._session._attached_to_cursor = False
             self._session = None
         self._sock_mgr = None
 
     def _end_session(self) -> None:
-        if self._session and self._session._is_implicit and not self._session.leave_alive:
-            self._session._is_attached_to_cursor = False
+        if self._session and self._session._implicit and not self._session._leave_alive:
+            self._session._attached_to_cursor = False
             self._session._end_implicit_session()
             self._session = None
 

pymongo/synchronous/cursor.py

@@ -138,7 +138,7 @@ def __init__(
 
         if session:
             self._session = session
-            self._session._is_attached_to_cursor = True
+            self._session._attached_to_cursor = True
         else:
             self._session = None
 
@@ -149,7 +149,7 @@ def __init__(
         if not isinstance(limit, int):
             raise TypeError(f"limit must be an instance of int, not {type(limit)}")
         validate_boolean("no_cursor_timeout", no_cursor_timeout)
-        if no_cursor_timeout and self._session and self._session._is_implicit:
+        if no_cursor_timeout and self._session and self._session._implicit:
             warnings.warn(
                 "use an explicit session with no_cursor_timeout=True "
                 "otherwise the cursor may still timeout after "
@@ -282,7 +282,7 @@ def clone(self) -> Cursor[_DocumentType]:
     def _clone(self, deepcopy: bool = True, base: Optional[Cursor] = None) -> Cursor:  # type: ignore[type-arg]
         """Internal clone helper."""
         if not base:
-            if self._session and not self._session._is_implicit:
+            if self._session and not self._session._implicit:
                 base = self._clone_base(self._session)
             else:
                 base = self._clone_base(None)
@@ -942,7 +942,7 @@ def session(self) -> Optional[ClientSession]:
 
         .. versionadded:: 3.6
         """
-        if self._session and not self._session._is_implicit:
+        if self._session and not self._session._implicit:
             return self._session
         return None
 
@@ -1033,8 +1033,8 @@ def _die_no_lock(self) -> None:
         self._collection.database.client._cleanup_cursor_no_lock(
             cursor_id, address, self._sock_mgr, self._session
         )
-        if self._session and self._session._is_implicit:
-            self._session._is_attached_to_cursor = False
+        if self._session and self._session._implicit:
+            self._session._attached_to_cursor = False
             self._session = None
         self._sock_mgr = None
 
@@ -1053,8 +1053,8 @@ def _die_lock(self) -> None:
             self._sock_mgr,
             self._session,
         )
-        if self._session and self._session._is_implicit:
-            self._session._is_attached_to_cursor = False
+        if self._session and self._session._implicit:
+            self._session._attached_to_cursor = False
             self._session = None
         self._sock_mgr = None