From 2c7d6859a42634921b2bb2447dfa890633db4d05 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Thu, 23 Sep 2010 19:55:24 +0000 Subject: [PATCH] Merged revisions 84980 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84980 | antoine.pitrou | 2010-09-23 21:51:39 +0200 (jeu., 23 sept. 2010) | 3 lines Issue #9928: Properly initialize the types exported by the bz2 module. ........ --- Misc/NEWS | 2 ++ Modules/bz2module.c | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index dfa9bd6ac89..a8e61731980 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -43,6 +43,8 @@ Core and Builtins Library ------- +- Issue #9928: Properly initialize the types exported by the bz2 module. + - Issue #9854: The default read() implementation in io.RawIOBase now handles non-blocking readinto() returning None correctly. diff --git a/Modules/bz2module.c b/Modules/bz2module.c index 0a367a77696..de2e20bbf7a 100644 --- a/Modules/bz2module.c +++ b/Modules/bz2module.c @@ -2320,9 +2320,12 @@ initbz2(void) { PyObject *m; - Py_TYPE(&BZ2File_Type) = &PyType_Type; - Py_TYPE(&BZ2Comp_Type) = &PyType_Type; - Py_TYPE(&BZ2Decomp_Type) = &PyType_Type; + if (PyType_Ready(&BZ2File_Type) < 0) + return; + if (PyType_Ready(&BZ2Comp_Type) < 0) + return; + if (PyType_Ready(&BZ2Decomp_Type) < 0) + return; m = Py_InitModule3("bz2", bz2_methods, bz2__doc__); if (m == NULL)