Merge #2772

2772: fix PyUnicodeDecodeError_Create r=davidhewitt a=mejrs Fixes #2770 Co-authored-by: mejrs <> Co-authored-by: David Hewitt <[email protected]>
PyO3 · Dec 27, 2022 · 1598991 · 1598991
2 parents 14d61e6 + 5fcc874
commit 1598991
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/newsfragments/2772.fixed.md b/newsfragments/2772.fixed.md
@@ -0,0 +1 @@
+Fix `PyUnicodeDecodeError_Create` failing unconditionally with a TypeError on PyPy.
diff --git a/pyo3-ffi/src/pyerrors.rs b/pyo3-ffi/src/pyerrors.rs
@@ -85,18 +85,17 @@ pub unsafe fn PyUnicodeDecodeError_Create(
     length: Py_ssize_t,
     start: Py_ssize_t,
     end: Py_ssize_t,
-    _reason: *const c_char,
+    reason: *const c_char,
 ) -> *mut PyObject {
     crate::PyObject_CallFunction(
         PyExc_UnicodeDecodeError,
-        std::ffi::CStr::from_bytes_with_nul(b"sy#nns\0")
-            .unwrap()
-            .as_ptr(),
+        b"sy#nns\0".as_ptr().cast::<c_char>(),
         encoding,
         object,
         length,
         start,
         end,
+        reason,
     )
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix `PyUnicodeDecodeError_Create` failing unconditionally with a TypeError on PyPy.