[Python-checkins] r84981 - in python/branches/release31-maint: Misc/NEWS Modules/bz2module.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Thu Sep 23 21:54:28 2010
New Revision: 84981

Log:
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.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/Modules/bz2module.c

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Thu Sep 23 21:54:28 2010
@@ -117,6 +117,8 @@
 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.
 

Modified: python/branches/release31-maint/Modules/bz2module.c
==============================================================================
--- python/branches/release31-maint/Modules/bz2module.c	(original)
+++ python/branches/release31-maint/Modules/bz2module.c	Thu Sep 23 21:54:28 2010
@@ -2158,9 +2158,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 NULL;
+    if (PyType_Ready(&BZ2Comp_Type) < 0)
+        return NULL;
+    if (PyType_Ready(&BZ2Decomp_Type) < 0)
+        return NULL;
 
     m = PyModule_Create(&bz2module);
     if (m == NULL)