post-merge

picnixz · picnixz · commit 1d55a54ecd4a · 2025-02-09T09:46:07.000+01:00
diff --git a/Python/codecs.c b/Python/codecs.c
@@ -1346,10 +1346,10 @@ _PyCodec_SurrogatePassUnicodeDecodeError(PyObject *exc)
 static PyObject *
 PyCodec_SurrogatePassErrors(PyObject *exc)
 {
-    if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeEncodeError)) {
+    if (_PyIsUnicodeEncodeError(exc)) {
         return _PyCodec_SurrogatePassUnicodeEncodeError(exc);
     }
-    else if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeDecodeError)) {
+    else if (!_PyIsUnicodeDecodeError(exc)) {
         return _PyCodec_SurrogatePassUnicodeDecodeError(exc);
     }
     else {

Original file line number	Diff line number	Diff line change
`@@ -1346,10 +1346,10 @@ _PyCodec_SurrogatePassUnicodeDecodeError(PyObject *exc)`
`1346`	`1346`	`static PyObject *`
`1347`	`1347`	`PyCodec_SurrogatePassErrors(PyObject *exc)`
`1348`	`1348`	`{`
`1349`		`- if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeEncodeError)) {`
	`1349`	`+ if (_PyIsUnicodeEncodeError(exc)) {`
`1350`	`1350`	`return _PyCodec_SurrogatePassUnicodeEncodeError(exc);`
`1351`	`1351`	`}`
`1352`		`- else if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeDecodeError)) {`
	`1352`	`+ else if (!_PyIsUnicodeDecodeError(exc)) {`
`1353`	`1353`	`return _PyCodec_SurrogatePassUnicodeDecodeError(exc);`
`1354`	`1354`	`}`
`1355`	`1355`	`else {`