error_fetch_and_normalize: PyPy 7.3.10+ does not need the PR #4079 workaround anymore. (#4154)

rwgk · web-flow · commit fac23b6f65e6 · 2022-08-24T13:08:24.000-07:00
diff --git a/include/pybind11/pytypes.h b/include/pybind11/pytypes.h
@@ -473,7 +473,7 @@ struct error_fetch_and_normalize {
                           + " failed to obtain the name "
                             "of the normalized active exception type.");
         }
-#if defined(PYPY_VERSION)
+#if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x07030a00
         // This behavior runs the risk of masking errors in the error handling, but avoids a
         // conflict with PyPy, which relies on the normalization here to change OSError to
         // FileNotFoundError (https://github.com/pybind/pybind11/issues/4075).

Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ struct error_fetch_and_normalize {`
`473`	`473`	`+ " failed to obtain the name "`
`474`	`474`	`"of the normalized active exception type.");`
`475`	`475`	`}`
`476`		`-#if defined(PYPY_VERSION)`
	`476`	`+#if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x07030a00`
`477`	`477`	`// This behavior runs the risk of masking errors in the error handling, but avoids a`
`478`	`478`	`// conflict with PyPy, which relies on the normalization here to change OSError to`
`479`	`479`	`// FileNotFoundError (https://github.com/pybind/pybind11/issues/4075).`