diff options
| author | Mark Shannon <mark@hotpy.org> | 2023-08-10 12:34:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-10 12:34:00 (GMT) |
| commit | 1d976b2da26cd62b5d0e860e3055df6fb893577f (patch) | |
| tree | 748c99207e35644ad1cf8d0ce2cd9cda7c568c22 /Include | |
| parent | bafedfbebd0f21291a7824d54e39ec79f142428b (diff) | |
| download | cpython-1d976b2da26cd62b5d0e860e3055df6fb893577f.zip cpython-1d976b2da26cd62b5d0e860e3055df6fb893577f.tar.gz cpython-1d976b2da26cd62b5d0e860e3055df6fb893577f.tar.bz2 | |
GH-106485: Handle dict subclasses correctly when dematerializing `__dict__` (GH-107837)
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/internal/pycore_dict.h | 2 | ||||
| -rw-r--r-- | Include/internal/pycore_global_objects_fini_generated.h | 1 | ||||
| -rw-r--r-- | Include/internal/pycore_global_strings.h | 1 | ||||
| -rw-r--r-- | Include/internal/pycore_runtime_init_generated.h | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/Include/internal/pycore_dict.h b/Include/internal/pycore_dict.h index 6ae81c0..2ad6ef0 100644 --- a/Include/internal/pycore_dict.h +++ b/Include/internal/pycore_dict.h @@ -199,7 +199,7 @@ _PyDict_NotifyEvent(PyInterpreterState *interp, } extern PyObject *_PyObject_MakeDictFromInstanceAttributes(PyObject *obj, PyDictValues *values); -extern int _PyObject_MakeInstanceAttributesFromDict(PyObject *obj, PyDictOrValues *dorv); +extern bool _PyObject_MakeInstanceAttributesFromDict(PyObject *obj, PyDictOrValues *dorv); extern PyObject *_PyDict_FromItems( PyObject *const *keys, Py_ssize_t keys_offset, PyObject *const *values, Py_ssize_t values_offset, diff --git a/Include/internal/pycore_global_objects_fini_generated.h b/Include/internal/pycore_global_objects_fini_generated.h index 6d50ffd..ee90105 100644 --- a/Include/internal/pycore_global_objects_fini_generated.h +++ b/Include/internal/pycore_global_objects_fini_generated.h @@ -547,6 +547,7 @@ _PyStaticObjects_CheckRefcnt(PyInterpreterState *interp) { _PyStaticObject_CheckRefcnt((PyObject *)&_Py_STR(anon_lambda)); _PyStaticObject_CheckRefcnt((PyObject *)&_Py_STR(anon_listcomp)); _PyStaticObject_CheckRefcnt((PyObject *)&_Py_STR(anon_module)); + _PyStaticObject_CheckRefcnt((PyObject *)&_Py_STR(anon_null)); _PyStaticObject_CheckRefcnt((PyObject *)&_Py_STR(anon_setcomp)); _PyStaticObject_CheckRefcnt((PyObject *)&_Py_STR(anon_string)); _PyStaticObject_CheckRefcnt((PyObject *)&_Py_STR(anon_unknown)); diff --git a/Include/internal/pycore_global_strings.h b/Include/internal/pycore_global_strings.h index bb1fb13..b081c0e 100644 --- a/Include/internal/pycore_global_strings.h +++ b/Include/internal/pycore_global_strings.h @@ -33,6 +33,7 @@ struct _Py_global_strings { STRUCT_FOR_STR(anon_lambda, "<lambda>") STRUCT_FOR_STR(anon_listcomp, "<listcomp>") STRUCT_FOR_STR(anon_module, "<module>") + STRUCT_FOR_STR(anon_null, "<NULL>") STRUCT_FOR_STR(anon_setcomp, "<setcomp>") STRUCT_FOR_STR(anon_string, "<string>") STRUCT_FOR_STR(anon_unknown, "<unknown>") diff --git a/Include/internal/pycore_runtime_init_generated.h b/Include/internal/pycore_runtime_init_generated.h index 2d66647..8c9c7f7 100644 --- a/Include/internal/pycore_runtime_init_generated.h +++ b/Include/internal/pycore_runtime_init_generated.h @@ -539,6 +539,7 @@ extern "C" { INIT_STR(anon_lambda, "<lambda>"), \ INIT_STR(anon_listcomp, "<listcomp>"), \ INIT_STR(anon_module, "<module>"), \ + INIT_STR(anon_null, "<NULL>"), \ INIT_STR(anon_setcomp, "<setcomp>"), \ INIT_STR(anon_string, "<string>"), \ INIT_STR(anon_unknown, "<unknown>"), \ |