]> granicus.if.org Git - python/commitdiff
Make os.read() return bytes, not bytearray.
authorGuido van Rossum <guido@python.org>
Wed, 21 Nov 2007 20:17:11 +0000 (20:17 +0000)
committerGuido van Rossum <guido@python.org>
Wed, 21 Nov 2007 20:17:11 +0000 (20:17 +0000)
Modules/posixmodule.c

index 27efcd38d426f797a7968133a02dad7422f0c28c..658d159c4a30769a855c4a7892aede9ccecfe01d 100644 (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;
 }