Return bytes, not string from read(). Makes test_mmap.py pass.

gvanrossum · gvanrossum · commit e5aeaad0ca1f · 2007-07-26T18:28:23.000Z
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
@@ -226,7 +226,7 @@ mmap_read_method(mmap_object *self,
 	if ((self->pos + num_bytes) > self->size) {
 		num_bytes -= (self->pos+num_bytes) - self->size;
 	}
-	result = Py_BuildValue("s#", self->data+self->pos, num_bytes);
+	result = PyBytes_FromStringAndSize(self->data+self->pos, num_bytes);
 	self->pos += num_bytes;
 	return result;
 }

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ mmap_read_method(mmap_object *self,`
`226`	`226`	`if ((self->pos + num_bytes) > self->size) {`
`227`	`227`	`num_bytes -= (self->pos+num_bytes) - self->size;`
`228`	`228`	`}`
`229`		`- result = Py_BuildValue("s#", self->data+self->pos, num_bytes);`
	`229`	`+ result = PyBytes_FromStringAndSize(self->data+self->pos, num_bytes);`
`230`	`230`	`self->pos += num_bytes;`
`231`	`231`	`return result;`
`232`	`232`	`}`