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/Misc/NEWS b/Misc/NEWS
index a437351776212416d75590e549a07b97e93bd9b8..d46f6b18992624d336f90b9b39ecec97d9e24d3b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -117,6 +117,8 @@ C-API
 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 215fa4b9ce502f92d4643802a0eb79b92b1ade39..f41896998d9befda0e2cab1588628ea86a65e6e2 100644 (file)
--- a/Modules/bz2module.c
+++ b/Modules/bz2module.c
@@ -2158,9 +2158,12 @@ PyInit_bz2(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 NULL;
+    if (PyType_Ready(&BZ2Comp_Type) < 0)
+        return NULL;
+    if (PyType_Ready(&BZ2Decomp_Type) < 0)
+        return NULL;
 
     m = PyModule_Create(&bz2module);
     if (m == NULL)