cpython: 1ae0b7b8de0b (original) (raw)

Mercurial > cpython

changeset 71347:1ae0b7b8de0b 3.2

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:01:21 +0200
parents	a19e99625c8a
children	6674272754da 13fbfe6308e2 8b52ac4a0c9f
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 @@ -27,6 +27,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 #12502: asyncore: fix polling loop with AF_UNIX sockets.
Issue #4376: ctypes now supports nested structures in a endian different than

--- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -6321,8 +6321,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;