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.
........
diff --git a/Modules/bz2module.c b/Modules/bz2module.c
index 0a367a7..de2e20b 100644
--- a/Modules/bz2module.c
+++ b/Modules/bz2module.c
@@ -2320,9 +2320,12 @@
{
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)