diff options
author | Campbell Barton <campbell@blender.org> | 2022-05-18 14:48:34 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-05-18 14:48:34 +0300 |
commit | 708547ab06519ce741a091a20777cd5b1bf27120 (patch) | |
tree | 09bb235a0006567296320f275b6d5ac82353a87e | |
parent | 8fb2a619668bd736c75852d6482cd5e017cd8c90 (diff) | |
parent | 136a06285f0e953f65dc432a4dba1ff3d1f781ee (diff) |
Merge branch 'blender-v3.2-release'
-rw-r--r-- | doc/python_api/sphinx_doc_gen.py | 6 | ||||
-rw-r--r-- | release/scripts/modules/rna_info.py | 8 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_rna_types_capi.c | 3 |
3 files changed, 16 insertions, 1 deletions
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index 1949d77a50b..0a20bd83c22 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -1456,6 +1456,12 @@ def pyrna2sphinx(basepath): pyprop2sphinx(" ", fw, identifier, py_prop) del py_properties, py_prop + # C/Python attributes: `GetSetDescriptorType`. + key = descr = None + for key, descr in sorted(struct.get_py_c_properties_getset()): + py_descr2sphinx(" ", fw, descr, "bpy.types", struct_id, key) + del key, descr + for func in struct.functions: args_str = ", ".join(prop.get_arg_default(force=False) for prop in func.args) diff --git a/release/scripts/modules/rna_info.py b/release/scripts/modules/rna_info.py index b009cc4fefe..687f3c95d0b 100644 --- a/release/scripts/modules/rna_info.py +++ b/release/scripts/modules/rna_info.py @@ -206,6 +206,14 @@ class InfoStructRNA: functions.append((identifier, attr)) return functions + def get_py_c_properties_getset(self): + import types + properties_getset = [] + for identifier, descr in self.py_class.__dict__.items(): + if type(descr) == types.GetSetDescriptorType: + properties_getset.append((identifier, descr)) + return properties_getset + def __str__(self): txt = "" diff --git a/source/blender/python/intern/bpy_rna_types_capi.c b/source/blender/python/intern/bpy_rna_types_capi.c index d58adb66b37..c3a07847aff 100644 --- a/source/blender/python/intern/bpy_rna_types_capi.c +++ b/source/blender/python/intern/bpy_rna_types_capi.c @@ -107,6 +107,7 @@ static struct PyMethodDef pyrna_text_methods[] = { * and creating the buffer, causing writes past the allocated length. * \{ */ +PyDoc_STRVAR(pyrna_WindowManager_clipboard_doc, "Clipboard text storage.\n\n:type: string"); static PyObject *pyrna_WindowManager_clipboard_get(PyObject *UNUSED(self), void *UNUSED(flag)) { int text_len = 0; @@ -154,7 +155,7 @@ static struct PyGetSetDef pyrna_windowmanager_getset[] = { {"clipboard", pyrna_WindowManager_clipboard_get, pyrna_WindowManager_clipboard_set, - NULL, + pyrna_WindowManager_clipboard_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; |