diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2008-08-02 21:02:48 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2008-08-02 21:02:48 (GMT) |
commit | 2f89aa678549eae1557247a36ed9194af9a4f7b7 (patch) | |
tree | b8de431ef79fb42ca92d8601977a8ab5ac533ca8 /Objects/memoryobject.c | |
parent | 07431a302a3698bec8b9eb9debc9f630479141e3 (diff) | |
download | cpython-2f89aa678549eae1557247a36ed9194af9a4f7b7.zip cpython-2f89aa678549eae1557247a36ed9194af9a4f7b7.tar.gz cpython-2f89aa678549eae1557247a36ed9194af9a4f7b7.tar.bz2 |
#2538: bytes objects can only provide read-only buffers
Diffstat (limited to 'Objects/memoryobject.c')
-rw-r--r-- | Objects/memoryobject.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c index 78ada17..79d7db1 100644 --- a/Objects/memoryobject.c +++ b/Objects/memoryobject.c @@ -56,7 +56,7 @@ PyMemoryView_FromObject(PyObject *base) if (mview == NULL) return NULL; mview->base = NULL; - if (PyObject_GetBuffer(base, &(mview->view), PyBUF_FULL) < 0) { + if (PyObject_GetBuffer(base, &(mview->view), PyBUF_FULL_RO) < 0) { Py_DECREF(mview); return NULL; } @@ -204,9 +204,9 @@ _indirect_copy_nd(char *dest, Py_buffer *view, char fort) a contiguous buffer if it is not. The view will point to the shadow buffer which can be written to and then will be copied back into the other buffer when the memory - view is de-allocated. While the shadow buffer is - being used, it will have an exclusive write lock on - the original buffer. + view is de-allocated. While the shadow buffer is + being used, it will have an exclusive write lock on + the original buffer. */ PyObject * @@ -528,7 +528,7 @@ memory_subscript(PyMemoryViewObject *self, PyObject *key) /* Return a new memory-view object */ Py_buffer newview; memset(&newview, 0, sizeof(newview)); - /* XXX: This needs to be fixed so it + /* XXX: This needs to be fixed so it actually returns a sub-view */ return PyMemoryView_FromMemory(&newview); |