fixes deferred/release blocker issue #3797: Fixed the dbm, marshal, mmap,
ossaudiodev, & winreg modules to return bytes objects instead of bytearray
objects.
diff --git a/Python/marshal.c b/Python/marshal.c
index d3f2d7f..e7981b8 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -1093,7 +1093,7 @@
}
if (wf.str != NULL) {
/* XXX Quick hack -- need to do this differently */
- res = PyByteArray_FromObject(wf.str);
+ res = PyBytes_FromObject(wf.str);
Py_DECREF(wf.str);
}
return res;
@@ -1134,9 +1134,9 @@
rf.ptr = PyBytes_AS_STRING(data);
rf.end = rf.ptr + PyBytes_GET_SIZE(data);
}
- else if (PyByteArray_Check(data)) {
- rf.ptr = PyByteArray_AS_STRING(data);
- rf.end = rf.ptr + PyByteArray_GET_SIZE(data);
+ else if (PyBytes_Check(data)) {
+ rf.ptr = PyBytes_AS_STRING(data);
+ rf.end = rf.ptr + PyBytes_GET_SIZE(data);
}
else {
PyErr_Format(PyExc_TypeError,