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

pgraph: Add pickling for LoaderFileTypeRegistry

Browse Source 
Useful to test that pickling singletons works
This commit is contained in:
rdb 2021-01-01 17:08:55 +01:00
parent 3a5201fd65
commit e755f87130
4 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/pgraph/loaderFileTypeRegistry.h
View File

@ -53,6 +53,8 @@ PUBLISHED:
static LoaderFileTypeRegistry *get_global_ptr(); static LoaderFileTypeRegistry *get_global_ptr();
EXTENSION(PyObject *__reduce__() const);
private: private:
void record_extension(const std::string &extension, LoaderFileType *type); void record_extension(const std::string &extension, LoaderFileType *type);

10
panda/src/pgraph/loaderFileTypeRegistry_ext.cxx
View File

@ -18,6 +18,7 @@
#include "pythonLoaderFileType.h" #include "pythonLoaderFileType.h"
extern struct Dtool_PyTypedObject Dtool_LoaderFileType; extern struct Dtool_PyTypedObject Dtool_LoaderFileType;
extern struct Dtool_PyTypedObject Dtool_LoaderFileTypeRegistry;
/** /**
* Registers a loader file type that is implemented in Python. * Registers a loader file type that is implemented in Python.
@ -112,4 +113,13 @@ unregister_type(PyObject *type) {
Py_XDECREF(save_func); Py_XDECREF(save_func);
} }
/**
* Implements pickle support.
*/
PyObject *Extension<LoaderFileTypeRegistry>::
__reduce__() const {
PyObject *func = PyObject_GetAttrString((PyObject *)&Dtool_LoaderFileTypeRegistry, "get_global_ptr");
return Py_BuildValue("N()", func);
}
#endif #endif

2
panda/src/pgraph/loaderFileTypeRegistry_ext.h
View File

@ -33,6 +33,8 @@ public:
void register_deferred_type(PyObject *entry_point); void register_deferred_type(PyObject *entry_point);
void unregister_type(PyObject *type); void unregister_type(PyObject *type);
PyObject *__reduce__() const;
}; };
#endif // HAVE_PYTHON #endif // HAVE_PYTHON

9
tests/pgraph/test_loader_types.py
View File

@ -3,6 +3,7 @@ import pytest
import tempfile import tempfile
import os import os
from contextlib import contextmanager from contextlib import contextmanager
import sys
@pytest.fixture @pytest.fixture
@ -218,3 +219,11 @@ def test_loader_ram_cache(test_filename):
assert model1 == model2 assert model1 == model2
ModelPool.release_model(model2) ModelPool.release_model(model2)
@pytest.mark.skipif(sys.version_info < (3, 4), reason="Requires Python 3.4")
def test_loader_file_type_registry_pickle():
from direct.stdpy.pickle import dumps, loads
registry = LoaderFileTypeRegistry.get_global_ptr()
assert loads(dumps(registry, -1)) == registry