PYTHON-5540 Fix usage of text_opts for older versions of pymongocrypt (#2525) [v4.15] (#2526)

mongodb-dbx-release-bot[bot] · blink1073 · web-flow · commit bc4ee39aac5b · 2025-09-11T05:32:34.000-05:00
Co-authored-by: Steven Silvester &lt;steven.silvester@ieee.org&gt;
diff --git a/pymongo/asynchronous/encryption.py b/pymongo/asynchronous/encryption.py
@@ -935,7 +935,8 @@ async def _encrypt_helper(
                 contention_factor=contention_factor,
                 range_opts=range_opts_bytes,
                 is_expression=is_expression,
-                text_opts=text_opts_bytes,
+                # For compatibility with pymongocrypt < 1.16:
+                **{"text_opts": text_opts_bytes} if text_opts_bytes else {},
             )
             return decode(encrypted_doc)["v"]
 
diff --git a/pymongo/synchronous/encryption.py b/pymongo/synchronous/encryption.py
@@ -928,7 +928,8 @@ def _encrypt_helper(
                 contention_factor=contention_factor,
                 range_opts=range_opts_bytes,
                 is_expression=is_expression,
-                text_opts=text_opts_bytes,
+                # For compatibility with pymongocrypt < 1.16:
+                **{"text_opts": text_opts_bytes} if text_opts_bytes else {},
             )
             return decode(encrypted_doc)["v"]
 

Original file line number	Diff line number	Diff line change
`@@ -935,7 +935,8 @@ async def _encrypt_helper(`
`935`	`935`	`contention_factor=contention_factor,`
`936`	`936`	`range_opts=range_opts_bytes,`
`937`	`937`	`is_expression=is_expression,`
`938`		`- text_opts=text_opts_bytes,`
	`938`	`+ # For compatibility with pymongocrypt < 1.16:`
	`939`	`+ **{"text_opts": text_opts_bytes} if text_opts_bytes else {},`
`939`	`940`	`)`
`940`	`941`	`return decode(encrypted_doc)["v"]`
`941`	`942`
Original file line number	Diff line number	Diff line change
`@@ -928,7 +928,8 @@ def _encrypt_helper(`
`928`	`928`	`contention_factor=contention_factor,`
`929`	`929`	`range_opts=range_opts_bytes,`
`930`	`930`	`is_expression=is_expression,`
`931`		`- text_opts=text_opts_bytes,`
	`931`	`+ # For compatibility with pymongocrypt < 1.16:`
	`932`	`+ **{"text_opts": text_opts_bytes} if text_opts_bytes else {},`
`932`	`933`	`)`
`933`	`934`	`return decode(encrypted_doc)["v"]`
`934`	`935`