cpython: 6674272754da (original) (raw)

Mercurial > cpython

changeset 71348:6674272754da

Issue #11321: Fix a crash with multiple imports of the _pickle module when embedding Python. Patch by Andreas Stührk. [#11321]

Antoine Pitrou solipsis@pitrou.net
date	Fri, 15 Jul 2011 21:02:09 +0200
parents	88de447abd0d(current diff)1ae0b7b8de0b(diff)
children	14e56b7d67c7 0a040aa9bb34
files	Misc/NEWS Modules/_pickle.c
diffstat	2 files changed, 5 insertions(+), 0 deletions(-)[+] [-] Misc/NEWS 3 Modules/_pickle.c 2

line wrap: on

line diff

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -225,6 +225,9 @@ Core and Builtins Library ------- +- Issue #11321: Fix a crash with multiple imports of the _pickle module when

embedding Python. Patch by Andreas Stührk. +

Issue #6755: Add get_wch() method to curses.window class. Patch by Iñigo Serna.

--- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -6338,8 +6338,10 @@ PyInit__pickle(void) if (m == NULL) return NULL;

Py_INCREF(&Pickler_Type); if (PyModule_AddObject(m, "Pickler", (PyObject *)&Pickler_Type) < 0) return NULL;
Py_INCREF(&Unpickler_Type); if (PyModule_AddObject(m, "Unpickler", (PyObject *)&Unpickler_Type) < 0) return NULL;