-
-
Notifications
You must be signed in to change notification settings - Fork 33.1k
gh-139871: Add bytearray.take_bytes([n])
to efficiently extract bytes
#140128
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.
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
Open
cmaloney
wants to merge
7
commits into
python:main
Choose a base branch
from
cmaloney:bytearray_bytes
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+291
−19
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
daf8e02
gh-139871: Update bytearray to contain PyBytesObject
cmaloney 39b2d15
📜🤖 Added by blurb_it.
blurb-it[bot] 86faf1d
Add bytearray.take_bytes
cmaloney a9328f4
Merge branch 'main' into bytearray_bytes
cmaloney e9f5ca9
Update Objects/bytearrayobject.c
cmaloney 4784957
Review fixes
cmaloney db19def
Merge branch 'main' into bytearray_bytes
cmaloney File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1451,6 +1451,58 @@ def test_resize(self): | |
self.assertRaises(MemoryError, bytearray().resize, sys.maxsize) | ||
self.assertRaises(MemoryError, bytearray(1000).resize, sys.maxsize) | ||
|
||
def test_take_bytes(self): | ||
ba = bytearray(b'ab') | ||
self.assertEqual(ba.take_bytes(), b'ab') | ||
self.assertEqual(len(ba), 0) | ||
self.assertEqual(ba, bytearray(b'')) | ||
|
||
# Positive and negative slicing. | ||
ba = bytearray(b'abcdef') | ||
self.assertEqual(ba.take_bytes(1), b'a') | ||
self.assertEqual(ba, bytearray(b'bcdef')) | ||
self.assertEqual(len(ba), 5) | ||
self.assertEqual(ba.take_bytes(-5), b'') | ||
self.assertEqual(ba, bytearray(b'bcdef')) | ||
self.assertEqual(len(ba), 5) | ||
self.assertEqual(ba.take_bytes(-3), b'bc') | ||
self.assertEqual(ba, bytearray(b'def')) | ||
self.assertEqual(len(ba), 3) | ||
self.assertEqual(ba.take_bytes(3), b'def') | ||
self.assertEqual(ba, bytearray(b'')) | ||
self.assertEqual(len(ba), 0) | ||
|
||
# Take nothing from emptiness. | ||
self.assertEqual(ba.take_bytes(0), b'') | ||
self.assertEqual(ba.take_bytes(), b'') | ||
self.assertEqual(ba.take_bytes(None), b'') | ||
|
||
# Out of bounds, bad take value. | ||
self.assertRaises(IndexError, ba.take_bytes, -1) | ||
self.assertRaises(TypeError, ba.take_bytes, 3.14) | ||
ba = bytearray(b'abcdef') | ||
self.assertRaises(IndexError, ba.take_bytes, 7) | ||
|
||
# Offset between physical and logical start (ob_bytes != ob_start). | ||
ba = bytearray(b'abcde') | ||
del ba[:2] | ||
self.assertEqual(ba, bytearray(b'cde')) | ||
self.assertEqual(ba.take_bytes(), b'cde') | ||
|
||
# Overallocation at end. | ||
ba = bytearray(b'abcde') | ||
del ba[-2:] | ||
self.assertEqual(ba, bytearray(b'abc')) | ||
self.assertEqual(ba.take_bytes(), b'abc') | ||
ba = bytearray(b'abcde') | ||
ba.resize(4) | ||
self.assertEqual(ba.take_bytes(), b'abcd') | ||
|
||
# Take of a bytearray with references should fail. | ||
ba = bytearray(b'abc') | ||
with memoryview(ba) as mv: | ||
self.assertRaises(BufferError, ba.take_bytes) | ||
self.assertEqual(ba.take_bytes(), b'abc') | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Need to update test_free_threading_bytearray to include |
||
|
||
def test_setitem(self): | ||
def setitem_as_mapping(b, i, val): | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
Misc/NEWS.d/next/Core_and_Builtins/2025-10-14-18-24-16.gh-issue-139871.SWtuUz.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
Update :class:`bytearray` to use a :class:`bytes` under the hood as its buffer | ||
and add :func:`bytearray.take_bytes` to take it out. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.