Skip to content

Commit aa84830

Browse files
committed
Merge remote-tracking branch 'upstream/main' into release-toml
# Conflicts: # peps/pep-0596.rst # peps/pep-0619.rst # peps/pep-0664.rst # peps/pep-0719.rst
2 parents 1f1c73d + 54ab504 commit aa84830

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+5088
-1099
lines changed

.github/CODEOWNERS

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,7 @@ peps/pep-0774.rst @savannahostrowski
655655
peps/pep-0775.rst @encukou
656656
peps/pep-0776.rst @hoodmane @ambv
657657
peps/pep-0777.rst @warsaw
658+
peps/pep-0778.rst @warsaw
658659
# ...
659660
peps/pep-0779.rst @Yhg1s @colesbury @mpage
660661
peps/pep-0780.rst @lysnikolaou
@@ -666,9 +667,13 @@ peps/pep-0785.rst @gpshead
666667
# ...
667668
peps/pep-0787.rst @ncoghlan
668669
peps/pep-0788.rst @ZeroIntensity @vstinner
669-
# ...
670670
peps/pep-0789.rst @njsmith
671671
peps/pep-0790.rst @hugovk
672+
peps/pep-0791.rst @vstinner
673+
peps/pep-0792.rst @dstufft
674+
peps/pep-0793.rst @encukou
675+
peps/pep-0794.rst @brettcannon
676+
peps/pep-0798.rst @JelleZijlstra
672677
# ...
673678
peps/pep-0801.rst @warsaw
674679
# ...

peps/conf.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,10 @@
8383
# This config is a dictionary of external sites,
8484
# mapping unique short aliases to a base URL and a prefix.
8585
# https://www.sphinx-doc.org/en/master/usage/extensions/extlinks.html
86+
_repo = "python/cpython"
8687
extlinks = {
88+
"cpython-issue": (f"https://github.com/{_repo}/issues/%s", f"{_repo}#%s"),
89+
"cpython-pr": (f"https://github.com/{_repo}/pull/%s", f"{_repo}#%s"),
8790
"pypi": ("https://pypi.org/project/%s/", "%s"),
8891
}
8992

peps/pep-0011.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ powerpc64le-unknown-linux-gnu glibc, clang Victor Stinner
128128

129129
glibc, gcc Victor Stinner
130130
s390x-unknown-linux-gnu glibc, gcc Victor Stinner
131+
wasm32-unknown-emscripten emcc Russell Keith-Magee
131132
x86_64-linux-android Russell Keith-Magee, Petr Viktorin
132133
x86_64-unknown-freebsd BSD libc, clang Victor Stinner
133134
================================ =========================== ========
@@ -367,10 +368,6 @@ No-longer-supported platforms
367368
| Unsupported in: Python 3.7
368369
| Code removed in: Python 3.7
369370
370-
* | Name: wasm32-unknown-emscripten
371-
| Unsupported in: Python 3.13
372-
| Code removed in: Unknown
373-
374371

375372
Discussions
376373
===========

peps/pep-0387.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ Basic policy for backwards compatibility
114114
platforms).
115115

116116

117+
.. _pep387-soft-deprecation:
118+
117119
Soft Deprecation
118120
================
119121

peps/pep-0423.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ References and footnotes:
823823
.. _`in development official packaging documentation`:
824824
http://docs.python.org/dev/packaging/
825825
.. _`The Hitchhiker's Guide to Packaging`:
826-
http://guide.python-distribute.org/specification.html#naming-specification
826+
https://the-hitchhikers-guide-to-packaging.readthedocs.io/en/latest/
827827

828828

829829
Copyright

peps/pep-0467.rst

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Discussions-To: https://discuss.python.org/t/42001
55
Status: Draft
66
Type: Standards Track
77
Created: 30-Mar-2014
8-
Python-Version: 3.13
8+
Python-Version: 3.15
99
Post-History: 30-Mar-2014, 15-Aug-2014, 16-Aug-2014, 07-Jun-2016, 01-Sep-2016,
1010
13-Apr-2021, 03-Nov-2021, 27-Dec-2023
1111

@@ -21,6 +21,8 @@ This PEP proposes small adjustments to the APIs of the ``bytes`` and
2121
* Add ``getbyte`` byte retrieval method
2222
* Add ``iterbytes`` alternative iterator
2323

24+
The last two (``getbyte`` and ``iterbytes``) will also be added to ``memoryview``.
25+
2426
Rationale
2527
=========
2628

@@ -41,7 +43,7 @@ painful -- wire format protocols.
4143
This area of programming is characterized by a mixture of binary data and
4244
ASCII compatible segments of text (aka ASCII-encoded text). The addition of
4345
the new constructors, methods, and iterators will aid both in writing new
44-
wire format code, and in porting any remaining Python 2 wire format code.
46+
wire format code, and in updating existing code.
4547

4648
Common use-cases include ``dbf`` and ``pdf`` file formats, ``email``
4749
formats, and ``FTP`` and ``HTTP`` communications, among many others.
@@ -122,8 +124,8 @@ negative numbers. The documentation of the new methods will refer readers to
122124
Addition of "getbyte" method to retrieve a single byte
123125
------------------------------------------------------
124126

125-
This PEP proposes that ``bytes`` and ``bytearray`` gain the method ``getbyte``
126-
which will always return ``bytes``::
127+
This PEP proposes that ``bytes``, ``bytearray``, and ``memoryview`` gain the
128+
method ``getbyte`` which will always return ``bytes``::
127129

128130
>>> b'abc'.getbyte(0)
129131
b'a'
@@ -139,9 +141,9 @@ If an index is asked for that doesn't exist, ``IndexError`` is raised::
139141
Addition of optimised iterator methods that produce ``bytes`` objects
140142
---------------------------------------------------------------------
141143

142-
This PEP proposes that ``bytes`` and ``bytearray`` gain an optimised
143-
``iterbytes`` method that produces length 1 ``bytes`` objects rather than
144-
integers::
144+
This PEP proposes that ``bytes``, ``bytearray``, and ``memoryview`` gain an
145+
optimised ``iterbytes`` method that produces length 1 ``bytes`` objects rather
146+
than integers::
145147

146148
for x in data.iterbytes():
147149
# x is a length 1 ``bytes`` object, rather than an integer
@@ -202,13 +204,6 @@ Developers that use this method frequently will instead have the option to
202204
define their own ``bchr = bytes.fromint`` aliases.
203205

204206

205-
Scope limitation: memoryview
206-
----------------------------
207-
208-
Updating ``memoryview`` with the new item retrieval methods is outside the scope
209-
of this PEP.
210-
211-
212207
References
213208
==========
214209

0 commit comments

Comments
 (0)