TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 00:06:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

event: AsyncFuture::set_result() behavior changes:

Browse Source 
* Passing a Python subclass of a C++ class now works, the extra Python stuff isn't just discarded
* EventParameter objects are no longer automagically unwrapped - there's no more reason to pass an EventParameter to this method anyway, and it might be unexpected if it is treated specially.
This commit is contained in:
rdb 2021-03-01 20:38:18 +01:00
parent 99569fa8f2
commit 050d86dadb
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
panda/src/event/asyncFuture_ext.cxx
View File

@ -13,7 +13,6 @@
#include "asyncFuture_ext.h" #include "asyncFuture_ext.h"
#include "asyncTaskSequence.h" #include "asyncTaskSequence.h"
#include "eventParameter.h"
#include "paramValue.h" #include "paramValue.h"
#include "paramPyObject.h" #include "paramPyObject.h"
#include "pythonTask.h" #include "pythonTask.h"
@ -24,7 +23,6 @@
#ifndef CPPPARSER #ifndef CPPPARSER
extern struct Dtool_PyTypedObject Dtool_AsyncFuture; extern struct Dtool_PyTypedObject Dtool_AsyncFuture;
extern struct Dtool_PyTypedObject Dtool_EventParameter;
extern struct Dtool_PyTypedObject Dtool_ParamValueBase; extern struct Dtool_PyTypedObject Dtool_ParamValueBase;
extern struct Dtool_PyTypedObject Dtool_TypedObject; extern struct Dtool_PyTypedObject Dtool_TypedObject;
extern struct Dtool_PyTypedObject Dtool_TypedReferenceCount; extern struct Dtool_PyTypedObject Dtool_TypedReferenceCount;
@ -174,22 +172,22 @@ set_result(PyObject *result) {
return; return;
} }
else if (DtoolInstance_Check(result)) { else if (DtoolInstance_Check(result)) {
void *ptr; // If this is a Python subclass of a C++ type, fall through to below, since
if ((ptr = DtoolInstance_UPCAST(result, Dtool_EventParameter))) { // we don't want to lose that extra information.
_this->set_result(*(const EventParameter *)ptr); if (Py_TYPE(result) == (PyTypeObject *)DtoolInstance_TYPE(result)) {
return; void *ptr;
} if ((ptr = DtoolInstance_UPCAST(result, Dtool_TypedWritableReferenceCount))) {
if ((ptr = DtoolInstance_UPCAST(result, Dtool_TypedWritableReferenceCount))) { _this->set_result((TypedWritableReferenceCount *)ptr);
_this->set_result((TypedWritableReferenceCount *)ptr); return;
return; }
} if ((ptr = DtoolInstance_UPCAST(result, Dtool_TypedReferenceCount))) {
if ((ptr = DtoolInstance_UPCAST(result, Dtool_TypedReferenceCount))) { _this->set_result((TypedReferenceCount *)ptr);
_this->set_result((TypedReferenceCount *)ptr); return;
return; }
} if ((ptr = DtoolInstance_UPCAST(result, Dtool_TypedObject))) {
if ((ptr = DtoolInstance_UPCAST(result, Dtool_TypedObject))) { _this->set_result((TypedObject *)ptr);
_this->set_result((TypedObject *)ptr); return;
return; }
} }
} }
else if (PyUnicode_Check(result)) { else if (PyUnicode_Check(result)) {

6
tests/event/test_futures.py
View File

@ -200,12 +200,12 @@ def test_future_result():
fut = None fut = None
assert tex.get_ref_count() == rc assert tex.get_ref_count() == rc
# Store EventParameter (gets unwrapped) # Store EventParameter (no longer gets unwrapped)
ep = core.EventParameter(0.5) ep = core.EventParameter(0.5)
fut = core.AsyncFuture() fut = core.AsyncFuture()
fut.set_result(ep) fut.set_result(ep)
assert fut.result() == 0.5 assert fut.result() is ep
assert fut.result() == 0.5 assert fut.result() is ep
# Store TypedObject # Store TypedObject
dg = core.Datagram(b"test") dg = core.Datagram(b"test")