address review

Author: blink1073

doc/changelog.rst

@@ -19,6 +19,8 @@ PyMongo 4.11 brings a number of changes including:
   until either connection succeeds or a server selection timeout error is raised.
 - Added :func:`repr` support to :class:`pymongo.operations.IndexModel`.
 - Added :func:`repr` support to :class:`pymongo.operations.SearchIndexModel`.
+- Added ``sort`` parameter to
+  :meth:`~pymongo.collection.Collection.update_one` and :meth:`~pymongo.collection.Collection.replace_one`
 
 Issues Resolved
 ...............

pymongo/asynchronous/collection.py

@@ -1190,9 +1190,10 @@ async def replace_one(
             command.
         :param sort: Specify which document the operation updates if the query matches
             multiple documents. The first document matched by the sort order will be updated.
+            This option is only supported on MongoDB 8.0 and above.
         :return: - An instance of :class:`~pymongo.results.UpdateResult`.
 
-        .. versionchanged:: 4.10
+        .. versionchanged:: 4.11
            Added ``sort`` parameter.
         .. versionchanged:: 4.1
            Added ``let`` parameter.
@@ -1303,12 +1304,13 @@ async def update_one(
             aggregate expression context (e.g. "$$var").
         :param sort: Specify which document the operation updates if the query matches
             multiple documents. The first document matched by the sort order will be updated.
+            This option is only supported on MongoDB 8.0 and above.
         :param comment: A user-provided comment to attach to this
             command.
 
         :return: - An instance of :class:`~pymongo.results.UpdateResult`.
 
-        .. versionchanged:: 4.10
+        .. versionchanged:: 4.11
            Added ``sort`` parameter.
         .. versionchanged:: 4.1
            Added ``let`` parameter.

pymongo/synchronous/collection.py

@@ -1189,9 +1189,10 @@ def replace_one(
             command.
         :param sort: Specify which document the operation updates if the query matches
             multiple documents. The first document matched by the sort order will be updated.
+            This option is only supported on MongoDB 8.0 and above.
         :return: - An instance of :class:`~pymongo.results.UpdateResult`.
 
-        .. versionchanged:: 4.10
+        .. versionchanged:: 4.11
            Added ``sort`` parameter.
         .. versionchanged:: 4.1
            Added ``let`` parameter.
@@ -1302,12 +1303,13 @@ def update_one(
             aggregate expression context (e.g. "$$var").
         :param sort: Specify which document the operation updates if the query matches
             multiple documents. The first document matched by the sort order will be updated.
+            This option is only supported on MongoDB 8.0 and above.
         :param comment: A user-provided comment to attach to this
             command.
 
         :return: - An instance of :class:`~pymongo.results.UpdateResult`.
 
-        .. versionchanged:: 4.10
+        .. versionchanged:: 4.11
            Added ``sort`` parameter.
         .. versionchanged:: 4.1
            Added ``let`` parameter.

test/utils.py

@@ -958,11 +958,6 @@ def parse_spec_options(opts):
 def prepare_spec_arguments(spec, arguments, opname, entity_map, with_txn_callback):
     for arg_name in list(arguments):
         c2s = camel_to_snake(arg_name)
-        # PyMongo accepts sort as list of tuples or as an optional dict for update/replaceOne.
-        if arg_name == "sort":
-            if spec["name"] not in ["replaceOne", "updateOne"]:
-                sort_dict = arguments[arg_name]
-                arguments[arg_name] = list(sort_dict.items())
         # Named "key" instead not fieldName.
         if arg_name == "fieldName":
             arguments["key"] = arguments.pop(arg_name)