Merge branch 'pybind:master' into master

This commit is contained in:
Steve R. Sun 2023-01-20 09:12:49 +08:00 committed by GitHub
commit 9f574a741f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -107,11 +107,10 @@ def test_def_submodule_failures():
sm_name_orig = sm.__name__ sm_name_orig = sm.__name__
sm.__name__ = malformed_utf8 sm.__name__ = malformed_utf8
try: try:
with pytest.raises(Exception): # We want to assert that a bad __name__ causes some kind of failure, although we do not want to exercise
# Seen with Python 3.9: SystemError: nameless module # the internals of PyModule_GetName(). Currently all supported Python versions raise SystemError. If that
# But we do not want to exercise the internals of PyModule_GetName(), which could # changes in future Python versions, simply add the new expected exception types here.
# change in future versions of Python, but a bad __name__ is very likely to cause with pytest.raises(SystemError):
# some kind of failure indefinitely.
m.def_submodule(sm, b"SubSubModuleName") m.def_submodule(sm, b"SubSubModuleName")
finally: finally:
# Clean up to ensure nothing gets upset by a module with an invalid __name__. # Clean up to ensure nothing gets upset by a module with an invalid __name__.