mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-12 07:02:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 84980 via svnmerge from

Browse source 
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:54:28 +00:00
parent f67ea2d005
commit 9227508dec
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -117,6 +117,8 @@ C-API
Library Library
------- -------
- Issue #9928: Properly initialize the types exported by the bz2 module.
- Issue #9854: The default read() implementation in io.RawIOBase now - Issue #9854: The default read() implementation in io.RawIOBase now
handles non-blocking readinto() returning None correctly. handles non-blocking readinto() returning None correctly.

9
Modules/bz2module.c
View file

@ -2158,9 +2158,12 @@ PyInit_bz2(void)
{ {
PyObject *m; PyObject *m;
Py_TYPE(&BZ2File_Type) = &PyType_Type; if (PyType_Ready(&BZ2File_Type) < 0)
Py_TYPE(&BZ2Comp_Type) = &PyType_Type; return NULL;
Py_TYPE(&BZ2Decomp_Type) = &PyType_Type; if (PyType_Ready(&BZ2Comp_Type) < 0)
return NULL;
if (PyType_Ready(&BZ2Decomp_Type) < 0)
return NULL;
m = PyModule_Create(&bz2module); m = PyModule_Create(&bz2module);
if (m == NULL) if (m == NULL)