Skip to content

Commit c8ac889

Browse files
committed
Make PyBytesWriter_GetAllocated() private
1 parent 0313087 commit c8ac889

File tree

4 files changed

+7
-26
lines changed

4 files changed

+7
-26
lines changed

Include/cpython/bytesobject.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ PyAPI_FUNC(void*) PyBytesWriter_GetData(
6565
PyBytesWriter *writer);
6666
PyAPI_FUNC(Py_ssize_t) PyBytesWriter_GetSize(
6767
PyBytesWriter *writer);
68-
PyAPI_FUNC(Py_ssize_t) PyBytesWriter_GetAllocated(
69-
PyBytesWriter *writer);
7068

7169
PyAPI_FUNC(int) PyBytesWriter_WriteBytes(
7270
PyBytesWriter *writer,

Lib/test/test_capi/test_bytes.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@ def test_join(self):
292292

293293

294294
class BytesWriterTest(unittest.TestCase):
295-
SMALL_BUFFER = 256 # bytes
296295
result_type = bytes
297296

298297
def create_writer(self, alloc=0, string=b''):
@@ -302,17 +301,14 @@ def test_create(self):
302301
# Test PyBytesWriter_Create()
303302
writer = self.create_writer()
304303
self.assertEqual(writer.get_size(), 0)
305-
self.assertEqual(writer.get_allocated(), self.SMALL_BUFFER)
306304
self.assertEqual(writer.finish(), self.result_type(b''))
307305

308306
writer = self.create_writer(3, b'abc')
309307
self.assertEqual(writer.get_size(), 3)
310-
self.assertEqual(writer.get_allocated(), self.SMALL_BUFFER)
311308
self.assertEqual(writer.finish(), self.result_type(b'abc'))
312309

313310
writer = self.create_writer(10, b'abc')
314311
self.assertEqual(writer.get_size(), 10)
315-
self.assertEqual(writer.get_allocated(), self.SMALL_BUFFER)
316312
self.assertEqual(writer.finish_with_size(3), self.result_type(b'abc'))
317313

318314
def test_write_bytes(self):

Modules/_testcapi/bytes.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -222,19 +222,6 @@ writer_get_size(PyObject *self_raw, PyObject *Py_UNUSED(args))
222222
}
223223

224224

225-
static PyObject*
226-
writer_get_allocated(PyObject *self_raw, PyObject *Py_UNUSED(args))
227-
{
228-
WriterObject *self = (WriterObject *)self_raw;
229-
if (writer_check(self) < 0) {
230-
return NULL;
231-
}
232-
233-
Py_ssize_t alloc = PyBytesWriter_GetAllocated(self->writer);
234-
return PyLong_FromSsize_t(alloc);
235-
}
236-
237-
238225
static PyObject*
239226
writer_finish(PyObject *self_raw, PyObject *Py_UNUSED(args))
240227
{
@@ -273,7 +260,6 @@ static PyMethodDef writer_methods[] = {
273260
{"format_i", _PyCFunction_CAST(writer_format_i), METH_VARARGS},
274261
{"resize", _PyCFunction_CAST(writer_resize), METH_VARARGS},
275262
{"get_size", _PyCFunction_CAST(writer_get_size), METH_NOARGS},
276-
{"get_allocated", _PyCFunction_CAST(writer_get_allocated), METH_NOARGS},
277263
{"finish", _PyCFunction_CAST(writer_finish), METH_NOARGS},
278264
{"finish_with_size", _PyCFunction_CAST(writer_finish_with_size), METH_VARARGS},
279265
{NULL, NULL} /* sentinel */

Objects/bytesobject.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Py_LOCAL_INLINE(Py_ssize_t) _PyBytesWriter_GetSize(_PyBytesWriter *writer,
3838
char *str);
3939
static void* _PyBytesWriter_ResizeAndUpdatePointer(PyBytesWriter *writer,
4040
Py_ssize_t size, void *data);
41+
static Py_ssize_t _PyBytesWriter_GetAllocated(PyBytesWriter *writer);
4142

4243

4344
#define CHARACTERS _Py_SINGLETON(bytes_characters)
@@ -2859,7 +2860,7 @@ _PyBytes_FromList(PyObject *x)
28592860
return NULL;
28602861
}
28612862
char *str = PyBytesWriter_GetData(writer);
2862-
size = PyBytesWriter_GetAllocated(writer);
2863+
size = _PyBytesWriter_GetAllocated(writer);
28632864

28642865
for (Py_ssize_t i = 0; i < PyList_GET_SIZE(x); i++) {
28652866
PyObject *item = PyList_GET_ITEM(x, i);
@@ -2880,7 +2881,7 @@ _PyBytes_FromList(PyObject *x)
28802881
if (str == NULL) {
28812882
goto error;
28822883
}
2883-
size = PyBytesWriter_GetAllocated(writer);
2884+
size = _PyBytesWriter_GetAllocated(writer);
28842885
}
28852886
*str++ = (char) value;
28862887
}
@@ -2940,7 +2941,7 @@ _PyBytes_FromIterator(PyObject *it, PyObject *x)
29402941
return NULL;
29412942
}
29422943
char *str = PyBytesWriter_GetData(writer);
2943-
size = PyBytesWriter_GetAllocated(writer);
2944+
size = _PyBytesWriter_GetAllocated(writer);
29442945

29452946
/* Run the iterator to exhaustion */
29462947
for (i = 0; ; i++) {
@@ -2974,7 +2975,7 @@ _PyBytes_FromIterator(PyObject *it, PyObject *x)
29742975
if (str == NULL) {
29752976
goto error;
29762977
}
2977-
size = PyBytesWriter_GetAllocated(writer);
2978+
size = _PyBytesWriter_GetAllocated(writer);
29782979
}
29792980
*str++ = (char) value;
29802981
}
@@ -3946,8 +3947,8 @@ PyBytesWriter_GetSize(PyBytesWriter *writer)
39463947
}
39473948

39483949

3949-
Py_ssize_t
3950-
PyBytesWriter_GetAllocated(PyBytesWriter *writer)
3950+
static Py_ssize_t
3951+
_PyBytesWriter_GetAllocated(PyBytesWriter *writer)
39513952
{
39523953
return byteswriter_allocated(writer);
39533954
}

0 commit comments

Comments
 (0)