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

Make os.read() return bytes, not bytearray.

This commit is contained in:
Guido van Rossum 2007-11-21 20:17:11 +00:00
parent 82c0dfa3bd
commit f9e443c49f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/posixmodule.c
View File

@ -4746,18 +4746,18 @@ posix_read(PyObject *self, PyObject *args)
errno = EINVAL;
return posix_error();
}
buffer = PyBytes_FromStringAndSize((char *)NULL, size);
buffer = PyString_FromStringAndSize((char *)NULL, size);
if (buffer == NULL)
return NULL;
Py_BEGIN_ALLOW_THREADS
n = read(fd, PyBytes_AsString(buffer), size);
n = read(fd, PyString_AS_STRING(buffer), size);
Py_END_ALLOW_THREADS
if (n < 0) {
Py_DECREF(buffer);
return posix_error();
}
if (n != size)
PyBytes_Resize(buffer, n);
_PyString_Resize(&buffer, n);
return buffer;
}