Make PyBytesWriter_GetAllocated() private

Author: vstinner

Include/cpython/bytesobject.h

@@ -65,8 +65,6 @@ PyAPI_FUNC(void*) PyBytesWriter_GetData(
     PyBytesWriter *writer);
 PyAPI_FUNC(Py_ssize_t) PyBytesWriter_GetSize(
     PyBytesWriter *writer);
-PyAPI_FUNC(Py_ssize_t) PyBytesWriter_GetAllocated(
-    PyBytesWriter *writer);
 
 PyAPI_FUNC(int) PyBytesWriter_WriteBytes(
     PyBytesWriter *writer,

Lib/test/test_capi/test_bytes.py

@@ -292,7 +292,6 @@ def test_join(self):
 
 
 class BytesWriterTest(unittest.TestCase):
-    SMALL_BUFFER = 256  # bytes
     result_type = bytes
 
     def create_writer(self, alloc=0, string=b''):
@@ -302,17 +301,14 @@ def test_create(self):
         # Test PyBytesWriter_Create()
         writer = self.create_writer()
         self.assertEqual(writer.get_size(), 0)
-        self.assertEqual(writer.get_allocated(), self.SMALL_BUFFER)
         self.assertEqual(writer.finish(), self.result_type(b''))
 
         writer = self.create_writer(3, b'abc')
         self.assertEqual(writer.get_size(), 3)
-        self.assertEqual(writer.get_allocated(), self.SMALL_BUFFER)
         self.assertEqual(writer.finish(), self.result_type(b'abc'))
 
         writer = self.create_writer(10, b'abc')
         self.assertEqual(writer.get_size(), 10)
-        self.assertEqual(writer.get_allocated(), self.SMALL_BUFFER)
         self.assertEqual(writer.finish_with_size(3), self.result_type(b'abc'))
 
     def test_write_bytes(self):

Modules/_testcapi/bytes.c

@@ -222,19 +222,6 @@ writer_get_size(PyObject *self_raw, PyObject *Py_UNUSED(args))
 }
 
 
-static PyObject*
-writer_get_allocated(PyObject *self_raw, PyObject *Py_UNUSED(args))
-{
-    WriterObject *self = (WriterObject *)self_raw;
-    if (writer_check(self) < 0) {
-        return NULL;
-    }
-
-    Py_ssize_t alloc = PyBytesWriter_GetAllocated(self->writer);
-    return PyLong_FromSsize_t(alloc);
-}
-
-
 static PyObject*
 writer_finish(PyObject *self_raw, PyObject *Py_UNUSED(args))
 {
@@ -273,7 +260,6 @@ static PyMethodDef writer_methods[] = {
     {"format_i", _PyCFunction_CAST(writer_format_i), METH_VARARGS},
     {"resize", _PyCFunction_CAST(writer_resize), METH_VARARGS},
     {"get_size", _PyCFunction_CAST(writer_get_size), METH_NOARGS},
-    {"get_allocated", _PyCFunction_CAST(writer_get_allocated), METH_NOARGS},
     {"finish", _PyCFunction_CAST(writer_finish), METH_NOARGS},
     {"finish_with_size", _PyCFunction_CAST(writer_finish_with_size), METH_VARARGS},
     {NULL,              NULL}           /* sentinel */

Objects/bytesobject.c

@@ -38,6 +38,7 @@ Py_LOCAL_INLINE(Py_ssize_t) _PyBytesWriter_GetSize(_PyBytesWriter *writer,
                                                    char *str);
 static void* _PyBytesWriter_ResizeAndUpdatePointer(PyBytesWriter *writer,
                                                    Py_ssize_t size, void *data);
+static Py_ssize_t _PyBytesWriter_GetAllocated(PyBytesWriter *writer);
 
 
 #define CHARACTERS _Py_SINGLETON(bytes_characters)
@@ -2859,7 +2860,7 @@ _PyBytes_FromList(PyObject *x)
         return NULL;
     }
     char *str = PyBytesWriter_GetData(writer);
-    size = PyBytesWriter_GetAllocated(writer);
+    size = _PyBytesWriter_GetAllocated(writer);
 
     for (Py_ssize_t i = 0; i < PyList_GET_SIZE(x); i++) {
         PyObject *item = PyList_GET_ITEM(x, i);
@@ -2880,7 +2881,7 @@ _PyBytes_FromList(PyObject *x)
             if (str == NULL) {
                 goto error;
             }
-            size = PyBytesWriter_GetAllocated(writer);
+            size = _PyBytesWriter_GetAllocated(writer);
         }
         *str++ = (char) value;
     }
@@ -2940,7 +2941,7 @@ _PyBytes_FromIterator(PyObject *it, PyObject *x)
         return NULL;
     }
     char *str = PyBytesWriter_GetData(writer);
-    size = PyBytesWriter_GetAllocated(writer);
+    size = _PyBytesWriter_GetAllocated(writer);
 
     /* Run the iterator to exhaustion */
     for (i = 0; ; i++) {
@@ -2974,7 +2975,7 @@ _PyBytes_FromIterator(PyObject *it, PyObject *x)
             if (str == NULL) {
                 goto error;
             }
-            size = PyBytesWriter_GetAllocated(writer);
+            size = _PyBytesWriter_GetAllocated(writer);
         }
         *str++ = (char) value;
     }
@@ -3946,8 +3947,8 @@ PyBytesWriter_GetSize(PyBytesWriter *writer)
 }
 
 
-Py_ssize_t
-PyBytesWriter_GetAllocated(PyBytesWriter *writer)
+static Py_ssize_t
+_PyBytesWriter_GetAllocated(PyBytesWriter *writer)
 {
     return byteswriter_allocated(writer);
 }