mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 74581 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74581 | amaury.forgeotdarc | 2009-08-29 20:14:40 +0200 (sam., 29 août 2009) | 3 lines

  #6750: TextIOWrapped could duplicate output when several threads write to it.
  this affect text files opened with io.open(), and the print() function of py3k
........
This commit is contained in:
Amaury Forgeot d'Arc 2009-08-29 23:00:38 +00:00
parent 8d9a6eb531
commit ccd686a473
3 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Modules/_io/textio.c
View file

@ -1213,11 +1213,18 @@ findchar(const Py_UNICODE *s, Py_ssize_t size, Py_UNICODE ch)
static int
_textiowrapper_writeflush(textio *self)
{
PyObject *b, *ret;
PyObject *pending, *b, *ret;
if (self->pending_bytes == NULL)
return 0;
b = _PyBytes_Join(_PyIO_empty_bytes, self->pending_bytes);
pending = self->pending_bytes;
Py_INCREF(pending);
self->pending_bytes_count = 0;
Py_CLEAR(self->pending_bytes);
b = _PyBytes_Join(_PyIO_empty_bytes, pending);
Py_DECREF(pending);
if (b == NULL)
return -1;
ret = PyObject_CallMethodObjArgs(self->buffer,
@ -1226,8 +1233,6 @@ _textiowrapper_writeflush(textio *self)
if (ret == NULL)
return -1;
Py_DECREF(ret);
Py_CLEAR(self->pending_bytes);
self->pending_bytes_count = 0;
return 0;
}