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

fixes deferred/release blocker issue #3797: Fixed the dbm, marshal, mmap,

Browse source 
ossaudiodev, & winreg modules to return bytes objects instead of bytearray
objects.
This commit is contained in:
Gregory P. Smith 2008-09-06 21:34:51 +00:00
parent 7e958d1ceb
commit 0a608fdaac
6 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Modules/mmapmodule.c
View file

@ -228,7 +228,7 @@ mmap_read_line_method(mmap_object *self,
else
++eol; /* we're interested in the position after the
newline. */
result = PyByteArray_FromStringAndSize(start, (eol - start));
result = PyBytes_FromStringAndSize(start, (eol - start));
self->pos += (eol - start);
return result;
}
@ -248,7 +248,7 @@ mmap_read_method(mmap_object *self,
if (num_bytes > self->size - self->pos) {
num_bytes -= (self->pos+num_bytes) - self->size;
}
result = PyByteArray_FromStringAndSize(self->data+self->pos, num_bytes);
result = PyBytes_FromStringAndSize(self->data+self->pos, num_bytes);
self->pos += num_bytes;
return result;
}
@ -679,7 +679,7 @@ mmap_item(mmap_object *self, Py_ssize_t i)
PyErr_SetString(PyExc_IndexError, "mmap index out of range");
return NULL;
}
return PyByteArray_FromStringAndSize(self->data + i, 1);
return PyBytes_FromStringAndSize(self->data + i, 1);
}
static PyObject *
@ -769,14 +769,14 @@ mmap_ass_item(mmap_object *self, Py_ssize_t i, PyObject *v)
"mmap object doesn't support item deletion");
return -1;
}
if (! (PyByteArray_Check(v) && PyByteArray_Size(v)==1) ) {
if (! (PyBytes_Check(v) && PyBytes_Size(v)==1) ) {
PyErr_SetString(PyExc_IndexError,
"mmap assignment must be length-1 bytes()");
return -1;
}
if (!is_writable(self))
return -1;
buf = PyByteArray_AsString(v);
buf = PyBytes_AsString(v);
self->data[i] = buf[0];
return 0;
}