GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Merge branch 'main' into gh-158539 · hetaozdh/cpython@26762c8

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

Lib/test
- test_bytes.py
Misc/NEWS.d/next/Core_and_Builtins
- 2026-09-30-10-12-41.gh-issue-158316.Yv3kQe.rst
Objects
- bytearrayobject.c

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎Lib/test/test_bytes.py‎`

Copy file name to clipboardExpand all lines: Lib/test/test_bytes.py

+25Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`import textwrap`
`19`	`19`	`import threading`
`20`	`20`	`import unittest`
	`21`	`+from _codecs import _unregister_error as _codecs_unregister_error`
`21`	`22`
`22`	`23`	`import test.support`
`23`	`24`	`from test import support`
`@@ -2195,6 +2196,30 @@ def delslice():`
`2195`	`2196`	`self.assertRaises(BufferError, delslice)`
`2196`	`2197`	`self.assertEqual(b, orig)`
`2197`	`2198`
	`2199`	`+ def test_decode_resize_forbidden(self):`
	`2200`	`+ # The storage is pinned while it is decoded, so an error handler`
	`2201`	`+ # cannot resize the bytearray.`
	`2202`	`+ b = bytearray(b'ab\xffcd')`
	`2203`	`+ errors = 'test.bytearray_decode_resize'`
	`2204`	`+ def handler(exc):`
	`2205`	`+ self.assertRaises(BufferError, b.clear)`
	`2206`	`+ self.assertRaises(BufferError, b.append, 0)`
	`2207`	`+ return ('?', exc.end)`
	`2208`	`+ self.addCleanup(_codecs_unregister_error, errors)`
	`2209`	`+ codecs.register_error(errors, handler)`
	`2210`	`+ for encoding in 'utf-8', 'utf-8-sig':`
	`2211`	`+ with self.subTest(encoding=encoding):`
	`2212`	`+ self.assertEqual(b.decode(encoding, errors), 'ab?cd')`
	`2213`	`+ self.assertEqual(b, b'ab\xffcd')`
	`2214`	`+`
	`2215`	`+ def test_decode_subclass_buffer(self):`
	`2216`	`+ # decode() decodes the buffer that the object exports.`
	`2217`	`+ class B(bytearray):`
	`2218`	`+ def __buffer__(self, flags):`
	`2219`	`+ return memoryview(b'other')`
	`2220`	`+ self.assertEqual(B(b'mine').decode(), 'other')`
	`2221`	`+ self.assertEqual(B(b'mine').decode('latin-1'), 'other')`
	`2222`	`+`
`2198`	`2223`	`@test.support.cpython_only`
`2199`	`2224`	`def test_obsolete_write_lock(self):`
`2200`	`2225`	`_testcapi = import_helper.import_module('_testcapi')`

Collapse file

`‎Misc/NEWS.d/next/Core_and_Builtins/2026-09-30-10-12-41.gh-issue-158316.Yv3kQe.rst‎`

Copy file name to clipboard

+2Lines changed: 2 additions & 0 deletions

Display the source diff
Display the rich diff

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+On Free Threading, speed up :meth:`bytearray.decode` by decoding the underlying
	`2`	`+storage directly instead of going through the buffer protocol.`

Collapse file

`‎Objects/bytearrayobject.c‎`

Copy file name to clipboardExpand all lines: Objects/bytearrayobject.c

+13-1Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2599,7 +2599,19 @@ bytearray_decode_impl(PyByteArrayObject self, const char encoding,`
`2599`	`2599`	`{`
`2600`	`2600`	`if (encoding == NULL)`
`2601`	`2601`	`encoding = PyUnicode_GetDefaultEncoding();`
`2602`		`- return PyUnicode_FromEncodedObject((PyObject*)self, encoding, errors);`
	`2602`	`+ if (Py_TYPE(self)->tp_as_buffer->bf_getbuffer != bytearray_getbuffer) {`
	`2603`	`+ /* A subclass may export a different buffer. */`
	`2604`	`+ return PyUnicode_FromEncodedObject((PyObject*)self, encoding, errors);`
	`2605`	`+ }`
	`2606`	`+`
	`2607`	`+ /* Decode the storage directly instead of exporting a buffer, which`
	`2608`	`+ would re-acquire the critical section we already hold. Increase`
	`2609`	`+ exports to prevent the storage from changing during the decode. */`
	`2610`	`+ self->ob_exports++;`
	`2611`	`+ PyObject *res = PyUnicode_Decode(PyByteArray_AS_STRING(self),`
	`2612`	`+ Py_SIZE(self), encoding, errors);`
	`2613`	`+ self->ob_exports--;`
	`2614`	`+ return res;`
`2603`	`2615`	`}`
`2604`	`2616`
`2605`	`2617`	`PyDoc_STRVAR(alloc_doc,`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.