Use pytest.mark.skipif for Rust BSON test skipping

Replace custom skip_if_rust_bson decorator with pytest's built-in
skipif marker. This is the standard pytest way to conditionally skip
tests and integrates better with pytest's reporting.

All test classes that rely on unimplemented Rust BSON features are
now decorated with @skip_if_rust_bson which uses pytest.mark.skipif.

Author: aclark4life

gridfs/synchronous/__init__.py

@@ -21,15 +21,15 @@
 """
 from __future__ import annotations
 
-from gridfs.errors import NoFile
-from gridfs.grid_file_shared import DEFAULT_CHUNK_SIZE
 from gridfs.synchronous.grid_file import (
     GridFS,
     GridFSBucket,
     GridIn,
     GridOut,
     GridOutCursor,
 )
+from gridfs.errors import NoFile
+from gridfs.grid_file_shared import DEFAULT_CHUNK_SIZE
 
 __all__ = [
     "GridFS",

gridfs/synchronous/grid_file.py

@@ -37,11 +37,16 @@
     DEFAULT_CHUNK_SIZE,
     EMPTY,
     NEWLN,
-    _clear_entity_type_registry,
     _grid_in_property,
     _grid_out_property,
+    _clear_entity_type_registry,
 )
 from pymongo import ASCENDING, DESCENDING, WriteConcern, _csot
+from pymongo.synchronous.client_session import ClientSession
+from pymongo.synchronous.collection import Collection
+from pymongo.synchronous.cursor import Cursor
+from pymongo.synchronous.database import Database
+from pymongo.synchronous.helpers import next
 from pymongo.common import validate_string
 from pymongo.errors import (
     BulkWriteError,
@@ -53,11 +58,6 @@
 )
 from pymongo.helpers_shared import _check_write_command_response
 from pymongo.read_preferences import ReadPreference, _ServerMode
-from pymongo.synchronous.client_session import ClientSession
-from pymongo.synchronous.collection import Collection
-from pymongo.synchronous.cursor import Cursor
-from pymongo.synchronous.database import Database
-from pymongo.synchronous.helpers import next
 
 _IS_SYNC = True
 
@@ -302,7 +302,9 @@ def list(self, session: Optional[ClientSession] = None) -> list[str]:
         # With an index, distinct includes documents with no filename
         # as None.
         return [
-            name for name in self._files.distinct("filename", session=session) if name is not None
+            name
+            for name in self._files.distinct("filename", session=session)
+            if name is not None
         ]
 
     def find_one(
@@ -679,7 +681,9 @@ def upload_from_stream(
         .. versionchanged:: 3.6
            Added ``session`` parameter.
         """
-        with self.open_upload_stream(filename, chunk_size_bytes, metadata, session=session) as gin:
+        with self.open_upload_stream(
+            filename, chunk_size_bytes, metadata, session=session
+        ) as gin:
             gin.write(source)
 
         return cast(ObjectId, gin._id)
@@ -831,7 +835,9 @@ def delete(self, file_id: Any, session: Optional[ClientSession] = None) -> None:
             raise NoFile("no file could be deleted because none matched %s" % file_id)
 
     @_csot.apply
-    def delete_by_name(self, filename: str, session: Optional[ClientSession] = None) -> None:
+    def delete_by_name(
+        self, filename: str, session: Optional[ClientSession] = None
+    ) -> None:
         """Given a filename, delete this stored file's files collection document(s)
         and associated chunks from a GridFS bucket.
 
@@ -1002,7 +1008,9 @@ def download_to_stream_by_name(
         .. versionchanged:: 3.6
            Added ``session`` parameter.
         """
-        with self.open_download_stream_by_name(filename, revision, session=session) as gout:
+        with self.open_download_stream_by_name(
+            filename, revision, session=session
+        ) as gout:
             while True:
                 chunk = gout.readchunk()
                 if not len(chunk):
@@ -1163,7 +1171,9 @@ def __init__(
         object.__setattr__(self, "_buffered_docs", [])
         object.__setattr__(self, "_buffered_docs_size", 0)
 
-    def _create_index(self, collection: Collection[Any], index_key: Any, unique: bool) -> None:
+    def _create_index(
+        self, collection: Collection[Any], index_key: Any, unique: bool
+    ) -> None:
         doc = collection.find_one(projection={"_id": 1}, session=self._session)
         if doc is None:
             try:
@@ -1174,7 +1184,9 @@ def _create_index(self, collection: Collection[Any], index_key: Any, unique: boo
             except OperationFailure:
                 index_keys = []
             if index_key not in index_keys:
-                collection.create_index(index_key.items(), unique=unique, session=self._session)
+                collection.create_index(
+                    index_key.items(), unique=unique, session=self._session
+                )
 
     def _ensure_indexes(self) -> None:
         if not object.__getattribute__(self, "_ensured_index"):
@@ -1908,7 +1920,9 @@ def close(self) -> None:
 
 
 class GridOutIterator:
-    def __init__(self, grid_out: GridOut, chunks: Collection[Any], session: ClientSession):
+    def __init__(
+        self, grid_out: GridOut, chunks: Collection[Any], session: ClientSession
+    ):
         self._chunk_iter = GridOutChunkIterator(grid_out, chunks, session, 0)
 
     def __iter__(self) -> GridOutIterator:

pymongo/synchronous/aggregation.py

@@ -24,13 +24,13 @@
 from pymongo.read_preferences import ReadPreference, _AggWritePref
 
 if TYPE_CHECKING:
-    from pymongo.read_preferences import _ServerMode
     from pymongo.synchronous.client_session import ClientSession
     from pymongo.synchronous.collection import Collection
     from pymongo.synchronous.command_cursor import CommandCursor
     from pymongo.synchronous.database import Database
     from pymongo.synchronous.pool import Connection
     from pymongo.synchronous.server import Server
+    from pymongo.read_preferences import _ServerMode
     from pymongo.typings import _DocumentType, _Pipeline
 
 _IS_SYNC = True

pymongo/synchronous/auth.py

@@ -24,6 +24,7 @@
     TYPE_CHECKING,
     Any,
     Callable,
+    Coroutine,
     Mapping,
     MutableMapping,
     Optional,
@@ -32,6 +33,12 @@
 from urllib.parse import quote
 
 from bson.binary import Binary
+from pymongo.synchronous.auth_aws import _authenticate_aws
+from pymongo.synchronous.auth_oidc import (
+    _authenticate_oidc,
+    _get_authenticator,
+)
+from pymongo.synchronous.helpers import _getaddrinfo
 from pymongo.auth_shared import (
     MongoCredential,
     _authenticate_scram_start,
@@ -40,16 +47,10 @@
 )
 from pymongo.errors import ConfigurationError, OperationFailure
 from pymongo.saslprep import saslprep
-from pymongo.synchronous.auth_aws import _authenticate_aws
-from pymongo.synchronous.auth_oidc import (
-    _authenticate_oidc,
-    _get_authenticator,
-)
-from pymongo.synchronous.helpers import _getaddrinfo
 
 if TYPE_CHECKING:
-    from pymongo.hello import Hello
     from pymongo.synchronous.pool import Connection
+    from pymongo.hello import Hello
 
 HAVE_KERBEROS = True
 _USE_PRINCIPAL = False
@@ -68,7 +69,9 @@
 _IS_SYNC = True
 
 
-def _authenticate_scram(credentials: MongoCredential, conn: Connection, mechanism: str) -> None:
+def _authenticate_scram(
+    credentials: MongoCredential, conn: Connection, mechanism: str
+) -> None:
     """Authenticate using SCRAM."""
     username = credentials.username
     if mechanism == "SCRAM-SHA-256":
@@ -348,7 +351,9 @@ def _authenticate_default(credentials: MongoCredential, conn: Connection) -> Non
             source = credentials.source
             cmd = conn.hello_cmd()
             cmd["saslSupportedMechs"] = source + "." + credentials.username
-            mechs = (conn.command(source, cmd, publish_events=False)).get("saslSupportedMechs", [])
+            mechs = (conn.command(source, cmd, publish_events=False)).get(
+                "saslSupportedMechs", []
+            )
         if "SCRAM-SHA-256" in mechs:
             return _authenticate_scram(credentials, conn, "SCRAM-SHA-256")
         else:

pymongo/synchronous/auth_aws.py

@@ -23,8 +23,8 @@
 
 if TYPE_CHECKING:
     from bson.typings import _ReadableBuffer
-    from pymongo.auth_shared import MongoCredential
     from pymongo.synchronous.pool import Connection
+    from pymongo.auth_shared import MongoCredential
 
 _IS_SYNC = True
 

pymongo/synchronous/auth_oidc.py

@@ -40,8 +40,8 @@
 from pymongo.lock import Lock, _create_lock
 
 if TYPE_CHECKING:
-    from pymongo.auth_shared import MongoCredential
     from pymongo.synchronous.pool import Connection
+    from pymongo.auth_shared import MongoCredential
 
 _IS_SYNC = True
 
@@ -231,7 +231,9 @@ def _get_access_token(self) -> Optional[str]:
 
         return self.access_token
 
-    def _run_command(self, conn: Connection, cmd: MutableMapping[str, Any]) -> Mapping[str, Any]:
+    def _run_command(
+        self, conn: Connection, cmd: MutableMapping[str, Any]
+    ) -> Mapping[str, Any]:
         try:
             return conn.command("$external", cmd, no_reauth=True)  # type: ignore[call-arg]
         except OperationFailure as e:

pymongo/synchronous/bulk.py

@@ -36,6 +36,8 @@
 from bson.objectid import ObjectId
 from bson.raw_bson import RawBSONDocument
 from pymongo import _csot, common
+from pymongo.synchronous.client_session import ClientSession, _validate_session_write_concern
+from pymongo.synchronous.helpers import _handle_reauth
 from pymongo.bulk_shared import (
     _COMMANDS,
     _DELETE_ALL,
@@ -67,8 +69,6 @@
     _randint,
 )
 from pymongo.read_preferences import ReadPreference
-from pymongo.synchronous.client_session import ClientSession, _validate_session_write_concern
-from pymongo.synchronous.helpers import _handle_reauth
 from pymongo.write_concern import WriteConcern
 
 if TYPE_CHECKING:
@@ -614,7 +614,9 @@ def retryable_bulk(
             _raise_bulk_write_error(full_result)
         return full_result
 
-    def execute_op_msg_no_results(self, conn: Connection, generator: Iterator[Any]) -> None:
+    def execute_op_msg_no_results(
+        self, conn: Connection, generator: Iterator[Any]
+    ) -> None:
         """Execute write commands with OP_MSG and w=0 writeConcern, unordered."""
         db_name = self.collection.database.name
         client = self.collection.database.client

pymongo/synchronous/change_stream.py

@@ -22,6 +22,12 @@
 from bson.raw_bson import RawBSONDocument
 from bson.timestamp import Timestamp
 from pymongo import _csot, common
+from pymongo.synchronous.aggregation import (
+    _AggregationCommand,
+    _CollectionAggregationCommand,
+    _DatabaseAggregationCommand,
+)
+from pymongo.synchronous.command_cursor import CommandCursor
 from pymongo.collation import validate_collation_or_none
 from pymongo.errors import (
     ConnectionFailure,
@@ -31,12 +37,6 @@
     PyMongoError,
 )
 from pymongo.operations import _Op
-from pymongo.synchronous.aggregation import (
-    _AggregationCommand,
-    _CollectionAggregationCommand,
-    _DatabaseAggregationCommand,
-)
-from pymongo.synchronous.command_cursor import CommandCursor
 from pymongo.typings import _CollationIn, _DocumentType, _Pipeline
 
 _IS_SYNC = True
@@ -235,7 +235,9 @@ def _process_result(self, result: Mapping[str, Any], conn: Connection) -> None:
                         f"response : {result!r}"
                     )
 
-    def _run_aggregation_cmd(self, session: Optional[ClientSession]) -> CommandCursor:  # type: ignore[type-arg]
+    def _run_aggregation_cmd(
+        self, session: Optional[ClientSession]
+    ) -> CommandCursor:  # type: ignore[type-arg]
         """Run the full aggregation pipeline for this ChangeStream and return
         the corresponding CommandCursor.
         """

pymongo/synchronous/client_bulk.py

@@ -426,7 +426,9 @@ def _execute_batch(
     ) -> tuple[dict[str, Any], list[Mapping[str, Any]], list[Mapping[str, Any]]]:
         """Executes a batch of bulkWrite server commands (ack)."""
         request_id, msg, to_send_ops, to_send_ns = bwc.batch_command(cmd, ops, namespaces)
-        result = self.write_command(bwc, cmd, request_id, msg, to_send_ops, to_send_ns, self.client)  # type: ignore[arg-type]
+        result = self.write_command(
+            bwc, cmd, request_id, msg, to_send_ops, to_send_ns, self.client
+        )  # type: ignore[arg-type]
         return result, to_send_ops, to_send_ns  # type: ignore[return-value]
 
     def _process_results_cursor(

pymongo/synchronous/client_session.py

@@ -142,8 +142,9 @@
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     ContextManager,
+    Awaitable,
+    Callable,
     Mapping,
     MutableMapping,
     NoReturn,
@@ -156,6 +157,7 @@
 from bson.int64 import Int64
 from bson.timestamp import Timestamp
 from pymongo import _csot
+from pymongo.synchronous.cursor_base import _ConnectionManager
 from pymongo.errors import (
     ConfigurationError,
     ConnectionFailure,
@@ -168,7 +170,6 @@
 from pymongo.read_concern import ReadConcern
 from pymongo.read_preferences import ReadPreference, _ServerMode
 from pymongo.server_type import SERVER_TYPE
-from pymongo.synchronous.cursor_base import _ConnectionManager
 from pymongo.write_concern import WriteConcern
 
 if TYPE_CHECKING:
@@ -703,7 +704,9 @@ def callback(session, custom_arg, custom_kwarg=None):
         """
         start_time = time.monotonic()
         while True:
-            self.start_transaction(read_concern, write_concern, read_preference, max_commit_time_ms)
+            self.start_transaction(
+                read_concern, write_concern, read_preference, max_commit_time_ms
+            )
             try:
                 ret = callback(self)
             # Catch KeyboardInterrupt, CancelledError, etc. and cleanup.