Rip out __mutable_buffer__

python · JelleZijlstra · May 4, 2023 · Oct 2, 2022 · Oct 3, 2022 · Oct 4, 2022
commit 007fdc115383b42b78ddf28bdcd47714de9c53e7
diff --git a/Include/internal/pycore_abstract.h b/Include/internal/pycore_abstract.h
@@ -19,10 +19,6 @@ _PyIndex_Check(PyObject *obj)
 PyObject *_PyNumber_PowerNoMod(PyObject *lhs, PyObject *rhs);
 PyObject *_PyNumber_InPlacePowerNoMod(PyObject *lhs, PyObject *rhs);
 
-PyAPI_FUNC(PyObject *) _PyBuffer_MutableBufferGetter(PyObject *instance, void *ignored);
-
-#define _PY_BUFFER_MUTABLE_BUFFER_GETSET { "__mutable_buffer__", _PyBuffer_MutableBufferGetter, NULL, NULL },
-
 #ifdef __cplusplus
 }
 #endif

@@ -49,7 +49,7 @@ def _f(): pass
            "Mapping", "MutableMapping",
            "MappingView", "KeysView", "ItemsView", "ValuesView",
            "Sequence", "MutableSequence",
-           "ByteString", "Buffer", "MutableBuffer",
+           "ByteString", "Buffer",
            ]
 
 # This module has been renamed from collections.abc to _collections_abc to
@@ -454,18 +454,6 @@ def __subclasshook__(cls, C):
         return NotImplemented
 
 
-class MutableBuffer(Buffer):
-
-    __slots__ = ()
-    __mutable_buffer__ = True
-
-    @classmethod
-    def __subclasshook__(cls, C):
-        if cls is MutableBuffer:
-            return _check_methods(C, "__buffer__", "__mutable_buffer__")
-        return NotImplemented
-
-
 class _CallableGenericAlias(GenericAlias):
     """ Represent `Callable[argtypes, resulttype]`.
 

@@ -25,7 +25,7 @@
 from collections.abc import Set, MutableSet
 from collections.abc import Mapping, MutableMapping, KeysView, ItemsView, ValuesView
 from collections.abc import Sequence, MutableSequence
-from collections.abc import ByteString, Buffer, MutableBuffer
+from collections.abc import ByteString, Buffer
 
 
 class TestUserObjects(unittest.TestCase):
@@ -1953,15 +1953,6 @@ def test_Buffer(self):
             self.assertFalse(issubclass(sample, Buffer))
         self.validate_abstract_methods(Buffer, '__buffer__')
 
-    def test_MutableBuffer(self):
-        for sample in [bytearray, memoryview]:
-            self.assertIsInstance(sample(b"x"), MutableBuffer)
-            self.assertTrue(issubclass(sample, MutableBuffer))
-        for sample in [bytes, str, list, tuple]:
-            self.assertNotIsInstance(sample(), MutableBuffer)
-            self.assertFalse(issubclass(sample, MutableBuffer))
-        self.validate_abstract_methods(MutableBuffer, '__buffer__', '__release_buffer__')
-
     def test_MutableSequence(self):
         for sample in [tuple, str, bytes]:
             self.assertNotIsInstance(sample(), MutableSequence)

diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
@@ -125,7 +125,6 @@ bytes(cdata)
 #include "ctypes.h"
 
 #include "pycore_long.h"          // _PyLong_GetZero()
-#include "pycore_abstract.h"      // _PY_BUFFER_MUTABLE_BUFFER_GETSET
 
 PyObject *PyExc_ArgError = NULL;
 
@@ -2793,11 +2792,6 @@ static PyBufferProcs PyCData_as_buffer = {
     NULL,
 };
 
-static PyGetSetDef PyCData_getset[] = {
-    _PY_BUFFER_MUTABLE_BUFFER_GETSET
-    {NULL}
-};
-
 /*
  * CData objects are mutable, so they cannot be hashable!
  */
@@ -2907,7 +2901,7 @@ PyTypeObject PyCData_Type = {
     0,                                          /* tp_iternext */
     PyCData_methods,                                    /* tp_methods */
     PyCData_members,                                    /* tp_members */
-    PyCData_getset,                             /* tp_getset */
+    0,                                          /* tp_getset */
     0,                                          /* tp_base */
     0,                                          /* tp_dict */
     0,                                          /* tp_descr_get */
@@ -3330,7 +3324,6 @@ static PyGetSetDef PyCFuncPtr_getsets[] = {
     { "argtypes", (getter)PyCFuncPtr_get_argtypes,
       (setter)PyCFuncPtr_set_argtypes,
       "specify the argument types", NULL },
-    _PY_BUFFER_MUTABLE_BUFFER_GETSET
     { NULL, NULL }
 };
 
@@ -4455,7 +4448,7 @@ static PyTypeObject Struct_Type = {
     0,                                          /* tp_iternext */
     0,                                          /* tp_methods */
     0,                                          /* tp_members */
-    PyCData_getset,                             /* tp_getset */
+    0,                                          /* tp_getset */
     0,                                          /* tp_base */
     0,                                          /* tp_dict */
     0,                                          /* tp_descr_get */
@@ -4497,7 +4490,7 @@ static PyTypeObject Union_Type = {
     0,                                          /* tp_iternext */
     0,                                          /* tp_methods */
     0,                                          /* tp_members */
-    PyCData_getset,                             /* tp_getset */
+    0,                                          /* tp_getset */
     0,                                          /* tp_base */
     0,                                          /* tp_dict */
     0,                                          /* tp_descr_get */
@@ -4817,7 +4810,7 @@ PyTypeObject PyCArray_Type = {
     0,                                          /* tp_iternext */
     Array_methods,                              /* tp_methods */
     0,                                          /* tp_members */
-    PyCData_getset,                             /* tp_getset */
+    0,                                          /* tp_getset */
     0,                                          /* tp_base */
     0,                                          /* tp_dict */
     0,                                          /* tp_descr_get */
@@ -4948,7 +4941,6 @@ Simple_get_value(CDataObject *self, void *Py_UNUSED(ignored))
 static PyGetSetDef Simple_getsets[] = {
     { "value", (getter)Simple_get_value, (setter)Simple_set_value,
       "current value", NULL },
-    _PY_BUFFER_MUTABLE_BUFFER_GETSET
     { NULL, NULL }
 };
 
@@ -5192,7 +5184,6 @@ static PyGetSetDef Pointer_getsets[] = {
     { "contents", (getter)Pointer_get_contents,
       (setter)Pointer_set_contents,
       "the object this pointer points to (read-write)", NULL },
-    _PY_BUFFER_MUTABLE_BUFFER_GETSET
     { NULL, NULL }
 };
 

diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
@@ -1,5 +1,4 @@
 #include "Python.h"
-#include "pycore_abstract.h"      // _PY_BUFFER_MUTABLE_BUFFER_GETSET
 #include "pycore_object.h"
 #include <stddef.h>               // offsetof()
 #include "_iomodule.h"
@@ -1125,11 +1124,6 @@ static PyBufferProcs bytesiobuf_as_buffer = {
     (releasebufferproc) bytesiobuf_releasebuffer,
 };
 
-static PyGetSetDef bytesiobuf_getset[] = {
-    _PY_BUFFER_MUTABLE_BUFFER_GETSET
-    {NULL}
-};
-
 Py_EXPORTED_SYMBOL PyTypeObject _PyBytesIOBuffer_Type = {
     PyVarObject_HEAD_INIT(NULL, 0)
     "_io._BytesIOBuffer",                      /*tp_name*/
@@ -1160,7 +1154,7 @@ Py_EXPORTED_SYMBOL PyTypeObject _PyBytesIOBuffer_Type = {
     0,                                         /*tp_iternext*/
     0,                                         /*tp_methods*/
     0,                                         /*tp_members*/
-    bytesiobuf_getset,                         /*tp_getset*/
+    0,                                         /*tp_getset*/
     0,                                         /*tp_base*/
     0,                                         /*tp_dict*/
     0,                                         /*tp_descr_get*/

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
@@ -9,7 +9,6 @@
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
-#include "pycore_abstract.h"      // _PY_BUFFER_MUTABLE_BUFFER_GETSET
 #include "pycore_moduleobject.h"  // _PyModule_GetState()
 #include "pycore_bytesobject.h"   // _PyBytes_Repeat
 #include "structmember.h"         // PyMemberDef
@@ -2278,7 +2277,6 @@ static PyGetSetDef array_getsets [] = {
      "the typecode character used to create the array"},
     {"itemsize", (getter) array_get_itemsize, N
EF5E
ULL,
      "the size, in bytes, of one array item"},
-    _PY_BUFFER_MUTABLE_BUFFER_GETSET
     {NULL}
 };
 

diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
@@ -24,7 +24,6 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-#include "pycore_abstract.h"      // _PY_BUFFER_MUTABLE_BUFFER_GETSET
 #include "pycore_bytesobject.h"   // _PyBytes_Find()
 #include "pycore_fileutils.h"     // _Py_stat_struct
 #include "structmember.h"         // PyMemberDef
@@ -888,7 +887,6 @@ static struct PyMethodDef mmap_object_methods[] = {
 
 static PyGetSetDef mmap_object_getset[] = {
     {"closed", (getter) mmap_closed_get, NULL, NULL},
-    _PY_BUFFER_MUTABLE_BUFFER_GETSET
     {NULL}
 };
 

diff --git a/Objects/abstract.c b/Objects/abstract.c
@@ -2967,8 +2967,3 @@ _Py_FreeCharPArray(char *const array[])
     }
     PyMem_Free((void*)array);
 }
-
-PyObject *
-_PyBuffer_MutableBufferGetter(PyObject *instance, void *ignored) {
-    Py_RETURN_TRUE;
-}
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
@@ -2,7 +2,7 @@
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
-#include "pycore_abstract.h"      // _PyIndex_Check(), _PY_BUFFER_MUTABLE_BUFFER_GETSET
+#include "pycore_abstract.h"      // _PyIndex_Check()
 #include "pycore_bytes_methods.h"
 #include "pycore_bytesobject.h"
 #include "pycore_object.h"        // _PyObject_GC_UNTRACK()
@@ -2289,11 +2289,6 @@ Construct a mutable bytearray object from:\n\
 
 static PyObject *bytearray_iter(PyObject *seq);
 
-static PyGetSetDef bytearray_getset[] = {
-    _PY_BUFFER_MUTABLE_BUFFER_GETSET
-    {NULL}
-};
-
 PyTypeObject PyByteArray_Type = {
     PyVarObject_HEAD_INIT(&PyType_Type, 0)
     "bytearray",
@@ -2325,7 +2320,7 @@ PyTypeObject PyByteArray_Type = {
     0,                                  /* tp_iternext */
     bytearray_methods,                  /* tp_methods */
     0,                                  /* tp_members */
-    bytearray_getset,                   /* tp_getset */
+    0,                                  /* tp_getset */
     0,                                  /* tp_base */
     0,                                  /* tp_dict */
     0,                                  /* tp_descr_get */

diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
@@ -11,7 +11,7 @@
  */
 
 #include "Python.h"
-#include "pycore_abstract.h"      // _PyIndex_Check(), _PY_BUFFER_MUTABLE_BUFFER_GETSET
+#include "pycore_abstract.h"      // _PyIndex_Check()
 #include "pycore_object.h"        // _PyObject_GC_UNTRACK()
 #include "pycore_strhex.h"        // _Py_strhex_with_sep()
 #include <stddef.h>               // offsetof()
@@ -3186,7 +3186,6 @@ static PyGetSetDef memory_getsetlist[] = {
     {"c_contiguous",    (getter)memory_c_contiguous,   NULL, memory_c_contiguous_doc},
     {"f_contiguous",    (getter)memory_f_contiguous,   NULL, memory_f_contiguous_doc},
     {"contiguous",      (getter)memory_contiguous,     NULL, memory_contiguous_doc},
-    _PY_BUFFER_MUTABLE_BUFFER_GETSET
     {NULL, NULL, NULL, NULL},
 };
 

diff --git a/Objects/picklebufobject.c b/Objects/picklebufobject.c
@@ -2,7 +2,6 @@
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
-#include "pycore_abstract.h"      // _PY_BUFFER_MUTABLE_BUFFER_GETSET
 #include <stddef.h>
 
 typedef struct {
@@ -204,10 +203,6 @@ static PyMethodDef picklebuf_methods[] = {
     {NULL,      NULL}
 };
 
-static PyGetSetDef picklebuf_getset[] = {
-    _PY_BUFFER_MUTABLE_BUFFER_GETSET
-    {NULL}
-};
 PyTypeObject PyPickleBuffer_Type = {
     PyVarObject_HEAD_INIT(NULL, 0)
     .tp_name = "pickle.PickleBuffer",
@@ -221,5 +216,4 @@ PyTypeObject PyPickleBuffer_Type = {
     .tp_weaklistoffset = offsetof(PyPickleBufferObject, weakreflist),
     .tp_as_buffer = &picklebuf_as_buffer,
     .tp_methods = picklebuf_methods,
-    .tp_getset = picklebuf_getset,
 };
@@ -2,7 +2,6 @@
 
 #include "Python.h"
 #include "pycore_call.h"
-#include "pycore_abstract.h"      // _PyBuffer_MutableBufferGetter
 #include "pycore_code.h"          // CO_FAST_FREE
 #include "pycore_compile.h"       // _Py_Mangle()
 #include "pycore_initconfig.h"    // _PyStatus_OK()
@@ -6196,24 +6195,15 @@ type_add_getset(PyTypeObject *type)
 
     PyObject *dict = type->tp_dict;
     for (; gsp->name != NULL; gsp++) {
-        if (gsp->get == _PyBuffer_MutableBufferGetter) {
-            PyObject *name = PyUnicode_FromString(gsp->name);
-            if (PyDict_SetDefault(dict, name, Py_True) == NULL) {
-                Py_DECREF(name);
-                return -1;
-            }
-            Py_DECREF(name);
-        } else {
-            PyObject *descr = PyDescr_NewGetSet(type, gsp);
-            if (descr == NULL) {
-                return -1;
-            }
-            if (PyDict_SetDefault(dict, PyDescr_NAME(descr), descr) == NULL) {
-                Py_DECREF(descr);
-                return -1;
-            }
+        PyObject *descr = PyDescr_NewGetSet(type, gsp);
+        if (descr == NULL) {
+            return -1;
+        }
+        if (PyDict_SetDefault(dict, PyDescr_NAME(descr), descr) == NULL) {
             Py_DECREF(descr);
+            return -1;
         }
+        Py_DECREF(descr);
     }
     return 0;
 }
@@ -8565,7 +8555,7 @@ bufferwrapper_releasebuf(PyObject *self, Py_buffer *view)
 
     assert(PyMemoryView_Check(bw->mv));
     Py_TYPE(bw->mv)->tp_as_buffer->bf_releasebuffer(bw->mv, view);
-    if (Py_TYPE(bw->obj)->tp_as_buffer != NULL 
+    if (Py_TYPE(bw->obj)->tp_as_buffer != NULL
         && Py_TYPE(bw->obj)->tp_as_buffer->bf_releasebuffer != NULL) {
         Py_TYPE(bw->obj)->tp_as_buffer->bf_releasebuffer(bw->obj, view);
     }
@@ -8589,7 +8579,7 @@ PyTypeObject _PyBufferWrapper_Type = {
     .tp_as_buffer = &bufferwrapper_as_buffer,
 };
 
-static int 
+static int
 slot_bf_getbuffer(PyObject *self, Py_buffer *buffer, int flags)
 {
     PyObject *flags_obj = PyLong_FromLong(flags);
@@ -8837,7 +8827,7 @@ static slotdef slotdefs[] = {
             "Return a buffer object that exposes the underlying memory of the object."),
     BUFSLOT(__release_buffer__, bf_releasebuffer, slot_bf_releasebuffer, wrap_releasebuffer,
             "__release_buffer__($self, /)\n--\n\n"
-            "Release the buffer object that exposes the underlying memory of the object."), 
+            "Release the buffer object that exposes the underlying memory of the object."),
 
     AMSLOT(__await__, am_await, slot_am_await, wrap_unaryfunc,
            "__await__($self, /)\n--\n\nReturn an iterator to be used in await expression."),