Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[WIP] gh-129813: Add PyBytesWriter C API #129814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vstinner wants to merge 8 commits into from
Closed

[WIP] gh-129813: Add PyBytesWriter C API #129814

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
490222f
gh-129813: Add PyBytesWriter C API
vstinner Feb 3, 2025
8f8aeb8
Add documentation
vstinner Feb 13, 2025
68d2fe7
Add PyBytesWriter_GetRemaining()
vstinner Feb 14, 2025
e582385
Optimize bytes_fromformat()
vstinner Feb 14, 2025
7cb444b
Remove PyBytesWriter_GetAllocated()
vstinner Feb 14, 2025
486d7cd
Add 'center' example
vstinner Feb 14, 2025
c4f4c07
Change PyBytesWriter_WriteBytes() argument type to void*
vstinner Feb 16, 2025
18ec24d
Documentation
vstinner Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Optimize bytes_fromformat()
  • Loading branch information
@vstinner
vstinner committed Feb 14, 2025
commit e582385a8fab0d7b350015296536a0888fbeeb49
15 changes: 13 additions & 2 deletions Lib/test/test_capi/test_bytes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,15 +291,25 @@ def test_join(self):


class PyBytesWriterTest(unittest.TestCase):
def create_writer(self, alloc):
return _testcapi.PyBytesWriter(alloc)
def create_writer(self, alloc, string=b''):
return _testcapi.PyBytesWriter(alloc, string)

def test_empty(self):
# Test PyBytesWriter_Create()
writer = self.create_writer(0)
self.assertEqual(writer.get_remaining(), 0)
self.assertEqual(writer.finish(), b'')

def test_abc(self):
# Test PyBytesWriter_Create()
writer = self.create_writer(3, b'abc')
self.assertEqual(writer.get_remaining(), 0)
self.assertEqual(writer.finish(), b'abc')

writer = self.create_writer(10, b'abc')
self.assertEqual(writer.get_remaining(), 7)
self.assertEqual(writer.finish(), b'abc')

def test_write_bytes(self):
# Test PyBytesWriter_WriteBytes()

Expand Down Expand Up @@ -352,6 +362,7 @@ def test_format(self):
# Test PyBytesWriter_Format()
writer = self.create_writer(0)
writer.format_i(123456)
self.assertEqual(writer.get_remaining(), 0)
self.assertEqual(writer.finish(), b'123456')


Expand Down
8 changes: 7 additions & 1 deletion Modules/_testcapi/bytes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,20 @@ writer_init(PyObject *self_raw, PyObject *args, PyObject *kwargs)
}

Py_ssize_t alloc;
if (!PyArg_ParseTuple(args, "n", &alloc)) {
char *str;
Py_ssize_t str_size;
if (!PyArg_ParseTuple(args, "ny#", &alloc, &str, &str_size)) {
return -1;
}

self->buf = PyBytesWriter_Create(&self->writer, alloc);
if (self->buf == NULL) {
return -1;
}

memcpy(self->buf, str, str_size);
self->buf += str_size;

return 0;
}

Expand Down
16 changes: 12 additions & 4 deletions Objects/bytesobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,15 @@ bytes_fromformat(PyBytesWriter *writer, char *s,

#define WRITE_BYTES(str) \
do { \
s = PyBytesWriter_WriteBytes(writer, s, (str), strlen(str)); \
if (s == NULL) { \
goto error; \
Py_ssize_t len = strlen(str); \
if (len > 2) { \
s = PyBytesWriter_Extend(writer, s, len - 2); \
if (s == NULL) { \
goto error; \
} \
} \
memcpy(s, (str), len); \
s += len; \
} while (0)

for (f = format; *f; f++) {
Expand Down Expand Up @@ -355,7 +360,10 @@ bytes_fromformat(PyBytesWriter *writer, char *s,

default:
/* invalid format string: copy unformatted string and exit */
WRITE_BYTES(p);
s = PyBytesWriter_WriteBytes(writer, s, p, strlen(p));
if (s == NULL) {
goto error;
}
goto done;
}
}
Expand Down