diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2015-11-12 09:31:51 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-11-12 09:31:51 (GMT) |
| commit | 609a2e17ada69ba47e8011e9d5a0eba649a0ef65 (patch) | |
| tree | edf177dd3226efd5051163d1267b83ecd692094c /Objects | |
| parent | 45bde5d2ee58ac4887b034569c2ee930b3cfb8af (diff) | |
| parent | d7a441559921804a5a6141c3ec42f896f8f3b010 (diff) | |
| download | cpython-609a2e17ada69ba47e8011e9d5a0eba649a0ef65.zip cpython-609a2e17ada69ba47e8011e9d5a0eba649a0ef65.tar.gz cpython-609a2e17ada69ba47e8011e9d5a0eba649a0ef65.tar.bz2 | |
Issue #22995: Default implementation of __reduce__ and __reduce_ex__ now
rejects builtin types with not defined __new__.
Added tests for non-pickleable types.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/typeobject.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 782c51b..f87d58f 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -4100,6 +4100,12 @@ reduce_newobj(PyObject *obj, int proto) PyObject *newobj, *newargs, *state, *listitems, *dictitems; PyObject *result; + if (Py_TYPE(obj)->tp_new == NULL) { + PyErr_Format(PyExc_TypeError, + "can't pickle %s objects", + Py_TYPE(obj)->tp_name); + return NULL; + } if (_PyObject_GetNewArguments(obj, &args, &kwargs) < 0) return NULL; |