PYTHON-4925 Revert multi change

Author: ShaneHarvey

pymongo/asynchronous/bulk.py

@@ -149,11 +149,7 @@ def add_update(
     ) -> None:
         """Create an update document and add it to the list of ops."""
         validate_ok_for_update(update)
-        cmd: dict[str, Any] = {"q": selector, "u": update}
-        if multi:
-            cmd["multi"] = multi
-            # A bulk_write containing an update_many is not retryable.
-            self.is_retryable = False
+        cmd: dict[str, Any] = {"q": selector, "u": update, "multi": multi}
         if upsert is not None:
             cmd["upsert"] = upsert
         if collation is not None:
@@ -168,6 +164,9 @@ def add_update(
         if sort is not None:
             self.uses_sort = True
             cmd["sort"] = sort
+        if multi:
+            # A bulk_write containing an update_many is not retryable.
+            self.is_retryable = False
         self.ops.append((_UPDATE, cmd))
 
     def add_replace(

pymongo/asynchronous/client_bulk.py

@@ -150,11 +150,8 @@ def add_update(
             "update": -1,
             "filter": selector,
             "updateMods": update,
+            "multi": multi,
         }
-        if multi:
-            # A bulk_write containing an update_many is not retryable.
-            self.is_retryable = False
-            cmd["multi"] = multi
         if upsert is not None:
             cmd["upsert"] = upsert
         if array_filters is not None:
@@ -167,6 +164,9 @@ def add_update(
             cmd["collation"] = collation
         if sort is not None:
             cmd["sort"] = sort
+        if multi:
+            # A bulk_write containing an update_many is not retryable.
+            self.is_retryable = False
         self.ops.append(("update", cmd))
         self.namespaces.append(namespace)
         self.total_ops += 1
@@ -211,16 +211,15 @@ def add_delete(
         hint: Union[str, dict[str, Any], None] = None,
     ) -> None:
         """Create a delete document and add it to the list of ops."""
-        cmd = {"delete": -1, "filter": selector}
-        if multi:
-            cmd["multi"] = multi
-            # A bulk_write containing an update_many is not retryable.
-            self.is_retryable = False
+        cmd = {"delete": -1, "filter": selector, "multi": multi}
         if hint is not None:
             cmd["hint"] = hint
         if collation is not None:
             self.uses_collation = True
             cmd["collation"] = collation
+        if multi:
+            # A bulk_write containing an update_many is not retryable.
+            self.is_retryable = False
         self.ops.append(("delete", cmd))
         self.namespaces.append(namespace)
         self.total_ops += 1

pymongo/synchronous/bulk.py

@@ -149,11 +149,7 @@ def add_update(
     ) -> None:
         """Create an update document and add it to the list of ops."""
         validate_ok_for_update(update)
-        cmd: dict[str, Any] = {"q": selector, "u": update}
-        if multi:
-            cmd["multi"] = multi
-            # A bulk_write containing an update_many is not retryable.
-            self.is_retryable = False
+        cmd: dict[str, Any] = {"q": selector, "u": update, "multi": multi}
         if upsert is not None:
             cmd["upsert"] = upsert
         if collation is not None:
@@ -168,6 +164,9 @@ def add_update(
         if sort is not None:
             self.uses_sort = True
             cmd["sort"] = sort
+        if multi:
+            # A bulk_write containing an update_many is not retryable.
+            self.is_retryable = False
         self.ops.append((_UPDATE, cmd))
 
     def add_replace(

pymongo/synchronous/client_bulk.py

@@ -150,11 +150,8 @@ def add_update(
             "update": -1,
             "filter": selector,
             "updateMods": update,
+            "multi": multi,
         }
-        if multi:
-            # A bulk_write containing an update_many is not retryable.
-            self.is_retryable = False
-            cmd["multi"] = multi
         if upsert is not None:
             cmd["upsert"] = upsert
         if array_filters is not None:
@@ -167,6 +164,9 @@ def add_update(
             cmd["collation"] = collation
         if sort is not None:
             cmd["sort"] = sort
+        if multi:
+            # A bulk_write containing an update_many is not retryable.
+            self.is_retryable = False
         self.ops.append(("update", cmd))
         self.namespaces.append(namespace)
         self.total_ops += 1
@@ -211,16 +211,15 @@ def add_delete(
         hint: Union[str, dict[str, Any], None] = None,
     ) -> None:
         """Create a delete document and add it to the list of ops."""
-        cmd = {"delete": -1, "filter": selector}
-        if multi:
-            cmd["multi"] = multi
-            # A bulk_write containing an update_many is not retryable.
-            self.is_retryable = False
+        cmd = {"delete": -1, "filter": selector, "multi": multi}
         if hint is not None:
             cmd["hint"] = hint
         if collation is not None:
             self.uses_collation = True
             cmd["collation"] = collation
+        if multi:
+            # A bulk_write containing an update_many is not retryable.
+            self.is_retryable = False
         self.ops.append(("delete", cmd))
         self.namespaces.append(namespace)
         self.total_ops += 1