Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
........
This commit is contained in:
Antoine Pitrou 2010-09-23 19:55:24 +00:00
parent fa647ec409
commit 2c7d6859a4
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -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.

9
Modules/bz2module.c
View File

@ -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)