diff options
| author | Yury Selivanov <yselivanov@sprymix.com> | 2015-07-03 05:10:11 (GMT) |
|---|---|---|
| committer | Yury Selivanov <yselivanov@sprymix.com> | 2015-07-03 05:10:11 (GMT) |
| commit | bb215e23004af8e8105fae4e132a63b0c25ea47c (patch) | |
| tree | 1e0023f5f39b23e58178ffeb992ac5e2264ff1e9 /Objects/typeobject.c | |
| parent | 1c5e5a89b4bc1a7b9dbd0375fbd76dfdadcb8605 (diff) | |
| parent | f488fb422a641aa7c38eb63c09f459e4baff7bc4 (diff) | |
| download | cpython-bb215e23004af8e8105fae4e132a63b0c25ea47c.zip cpython-bb215e23004af8e8105fae4e132a63b0c25ea47c.tar.gz cpython-bb215e23004af8e8105fae4e132a63b0c25ea47c.tar.bz2 | |
Merge 3.5 (Issue #19235)
Diffstat (limited to 'Objects/typeobject.c')
| -rw-r--r-- | Objects/typeobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 82c8710..1beed72 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -4142,7 +4142,7 @@ reduce_newobj(PyObject *obj, int proto) * were implemented in the same function: * - trying to pickle an object with a custom __reduce__ method that * fell back to object.__reduce__ in certain circumstances led to - * infinite recursion at Python level and eventual RuntimeError. + * infinite recursion at Python level and eventual RecursionError. * - Pickling objects that lied about their type by overwriting the * __class__ descriptor could lead to infinite recursion at C level * and eventual segfault. |