From e43dc87df593d3673b2daebbda00683f830221af Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 14 Dec 2024 15:25:03 +0100 Subject: [PATCH] Fix unit test failures on Python 3.13 --- panda/src/collide/collisionNode_ext.cxx | 2 +- tests/showbase/test_Loader.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/panda/src/collide/collisionNode_ext.cxx b/panda/src/collide/collisionNode_ext.cxx index ae42a0d7ef..8508cf5206 100644 --- a/panda/src/collide/collisionNode_ext.cxx +++ b/panda/src/collide/collisionNode_ext.cxx @@ -29,7 +29,7 @@ get_owner() const { PyObject *strong_ref; int result = 0; if (owner != nullptr) { - PyWeakref_GetRef(owner, &strong_ref); + result = PyWeakref_GetRef(owner, &strong_ref); } if (result > 0) { return strong_ref; diff --git a/tests/showbase/test_Loader.py b/tests/showbase/test_Loader.py index fe0c433326..db8812fd1f 100644 --- a/tests/showbase/test_Loader.py +++ b/tests/showbase/test_Loader.py @@ -120,9 +120,10 @@ fnrgl = fnargle:FnargleLoader sys.path = [str(tmp_path), platstdlib, stdlib] Loader._loadedPythonFileTypes = False + loader = Loader() - # base parameter is only used for audio - loader = Loader(None) + if not Loader._loadedPythonFileTypes: + Loader._loadPythonFileTypes() assert Loader._loadedPythonFileTypes # Should be registered, not yet loaded