Skip to content

Commit

Permalink
Merge branch 'main' into capi-pep
Browse files Browse the repository at this point in the history
  • Loading branch information
gvanrossum committed Oct 13, 2023
2 parents 8a2394b + 52a3481 commit 7236fed
Show file tree
Hide file tree
Showing 121 changed files with 252 additions and 233 deletions.
21 changes: 20 additions & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,25 @@ a discussion venue appropriate to the PEP (such as `Typing Discourse
typing, or `Packaging Discourse <https://discuss.python.org/c/packaging/>`__
for packaging), or `open an issue <https://github.com/python/peps/issues>`__.

Opening a pull request
----------------------

The PEPs repository defines a set of pull request templates, which should be
used when opening a PR.

If you use Git from the command line, you may be accustomed to creating PRs
by following the URL that is provided after pushing a new branch. **Do not use
this link**, as it does not provide the option to populate the PR template.

However, you *can* use the ``gh`` command line tool. ``gh pr create`` will allow
you to create a pull request, will prompt you for the template you wish to use,
and then give you the option of continuing editing in your broswer.

Alternatively, after pushing your branch, you can visit
`https://github.com/python/peps <https://github.com/python/peps>`__, and follow
the link in the notification about recent changes to your branch to
create a new PR. The in-browser interface will allow you to select a PR template
for your new PR.

Commit messages and PR titles
-----------------------------
Expand All @@ -56,7 +75,7 @@ the Readme/Contributing Guide, issue/PR template, etc., with ``Meta:``.
Sign the Contributor License Agreement
--------------------------------------

All contributors need to sign the
All contributors need to sign the
`PSF Contributor Agreement <https://www.python.org/psf/contrib/contrib-form/>`_.
to ensure we legally accept your work.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def test_pep_equal():
(
"pep-0008.rst",
{
"authors": "Guido van Rossum, Barry Warsaw, Nick Coghlan",
"authors": "Guido van Rossum, Barry Warsaw, Alyssa Coghlan",
"number": 8,
"shorthand": ":abbr:`PA (Process, Active)`",
"title": "Style Guide for Python Code",
Expand Down
2 changes: 1 addition & 1 deletion peps/pep-0001.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PEP: 1
Title: PEP Purpose and Guidelines
Author: Barry Warsaw, Jeremy Hylton, David Goodger, Nick Coghlan
Author: Barry Warsaw, Jeremy Hylton, David Goodger, Alyssa Coghlan
Status: Active
Type: Process
Created: 13-Jun-2000
Expand Down
2 changes: 1 addition & 1 deletion peps/pep-0008.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Version: $Revision$
Last-Modified: $Date$
Author: Guido van Rossum <guido@python.org>,
Barry Warsaw <barry@python.org>,
Nick Coghlan <ncoghlan@gmail.com>
Alyssa Coghlan <ncoghlan@gmail.com>
Status: Active
Type: Process
Content-Type: text/x-rst
Expand Down
2 changes: 1 addition & 1 deletion peps/pep-0306.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PEP: 306
Title: How to Change Python's Grammar
Version: $Revision$
Last-Modified: $Date$
Author: Michael Hudson <mwh@python.net>, Jack Diederich <jackdied@gmail.com>, Nick Coghlan <ncoghlan@gmail.com>, Benjamin Peterson <benjamin@python.org>
Author: Michael Hudson <mwh@python.net>, Jack Diederich <jackdied@gmail.com>, Alyssa Coghlan <ncoghlan@gmail.com>, Benjamin Peterson <benjamin@python.org>
Status: Withdrawn
Type: Informational
Content-Type: text/x-rst
Expand Down
2 changes: 1 addition & 1 deletion peps/pep-0338.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PEP: 338
Title: Executing modules as scripts
Version: $Revision$
Last-Modified: $Date$
Author: Nick Coghlan <ncoghlan@gmail.com>
Author: Alyssa Coghlan <ncoghlan@gmail.com>
Status: Final
Type: Standards Track
Content-Type: text/x-rst
Expand Down
2 changes: 1 addition & 1 deletion peps/pep-0340.rst
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ In no useful order: Alex Martelli, Barry Warsaw, Bob Ippolito,
Brett Cannon, Brian Sabbey, Chris Ryland, Doug Landauer, Duncan
Booth, Fredrik Lundh, Greg Ewing, Holger Krekel, Jason Diamond,
Jim Jewett, Josiah Carlson, Ka-Ping Yee, Michael Chermside,
Michael Hudson, Neil Schemenauer, Nick Coghlan, Paul Moore,
Michael Hudson, Neil Schemenauer, Alyssa Coghlan, Paul Moore,
Phillip Eby, Raymond Hettinger, Georg Brandl, Samuele
Pedroni, Shannon Behrens, Skip Montanaro, Steven Bethard, Terry
Reedy, Tim Delaney, Aahz, and others. Thanks all for the valuable
Expand Down
6 changes: 3 additions & 3 deletions peps/pep-0343.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PEP: 343
Title: The "with" Statement
Version: $Revision$
Last-Modified: $Date$
Author: Guido van Rossum, Nick Coghlan
Author: Guido van Rossum, Alyssa Coghlan
Status: Final
Type: Standards Track
Content-Type: text/x-rst
Expand All @@ -25,7 +25,7 @@ Author's Note
=============

This PEP was originally written in first person by Guido, and
subsequently updated by Nick Coghlan to reflect later discussion
subsequently updated by Alyssa (Nick) Coghlan to reflect later discussion
on python-dev. Any first person references are from Guido's
original.

Expand Down Expand Up @@ -938,7 +938,7 @@ References
.. [6] Proposal to use the PEP 342 enhanced generator API directly
https://mail.python.org/pipermail/python-dev/2005-October/056969.html
.. [7] Guido lets me (Nick Coghlan) talk him into a bad idea ;)
.. [7] Guido lets me (Alyssa Coghlan) talk him into a bad idea ;)
https://mail.python.org/pipermail/python-dev/2005-October/057018.html
.. [8] Guido raises some exception handling questions
Expand Down
2 changes: 1 addition & 1 deletion peps/pep-0346.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PEP: 346
Title: User Defined ("``with``") Statements
Version: $Revision$
Last-Modified: $Date$
Author: Nick Coghlan <ncoghlan@gmail.com>
Author: Alyssa Coghlan <ncoghlan@gmail.com>
Status: Withdrawn
Type: Standards Track
Content-Type: text/x-rst
Expand Down
2 changes: 1 addition & 1 deletion peps/pep-0348.rst
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ was used.
Acknowledgements
================

Thanks to Robert Brewer, Josiah Carlson, Nick Coghlan, Timothy
Thanks to Robert Brewer, Josiah Carlson, Alyssa Coghlan, Timothy
Delaney, Jack Diedrich, Fred L. Drake, Jr., Philip J. Eby, Greg Ewing,
James Y. Knight, MA Lemburg, Guido van Rossum, Stephen J. Turnbull,
Raymond Hettinger, and everyone else I missed for participating in the
Expand Down
2 changes: 1 addition & 1 deletion peps/pep-0359.rst
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ Keyword
-------

Does the ``make`` keyword break too much code? Originally, the make
statement used the keyword ``create`` (a suggestion due to Nick
statement used the keyword ``create`` (a suggestion due to Alyssa
Coghlan). However, investigations into the standard library [8]_ and
Zope+Plone code [9]_ revealed that ``create`` would break a lot more
code, so ``make`` was adopted as the keyword instead. However, there
Expand Down
2 changes: 1 addition & 1 deletion peps/pep-0366.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PEP: 366
Title: Main module explicit relative imports
Version: $Revision$
Last-Modified: $Date$
Author: Nick Coghlan <ncoghlan@gmail.com>
Author: Alyssa Coghlan <ncoghlan@gmail.com>
Status: Final
Type: Standards Track
Content-Type: text/x-rst
Expand Down
6 changes: 3 additions & 3 deletions peps/pep-0369.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ as post import hooks.
Use cases
=========

A use case for a post import hook is mentioned in Nick Coghlan's initial
A use case for a post import hook is mentioned in Alyssa (Nick) Coghlan's initial
posting [2]_. about callbacks on module import. It was found during the
development of Python 3.0 and its ABCs. We wanted to register classes
like decimal.Decimal with an ABC but the module should not be imported
on every interpreter startup. Nick came up with this example::
on every interpreter startup. Alyssa came up with this example::

@imp.when_imported('decimal')
def register(decimal):
Expand Down Expand Up @@ -261,7 +261,7 @@ documentation updates and additional unit tests.
Acknowledgments
===============

Nick Coghlan, for proof reading and the initial discussion
Alyssa Coghlan, for proof reading and the initial discussion
Phillip J. Eby, for his implementation in PEAK and help with my own implementation


Expand Down
2 changes: 1 addition & 1 deletion peps/pep-0377.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PEP: 377
Title: Allow __enter__() methods to skip the statement body
Version: $Revision$
Last-Modified: $Date$
Author: Nick Coghlan <ncoghlan@gmail.com>
Author: Alyssa Coghlan <ncoghlan@gmail.com>
Status: Rejected
Type: Standards Track
Content-Type: text/x-rst
Expand Down
4 changes: 2 additions & 2 deletions peps/pep-0378.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ task easier for many users.
.. _`Babel`: http://babel.edgewall.org/


Main Proposal (from Nick Coghlan, originally called Proposal I)
===============================================================
Main Proposal (from Alyssa Coghlan, originally called Proposal I)
=================================================================

A comma will be added to the format() specifier mini-language::

Expand Down
4 changes: 2 additions & 2 deletions peps/pep-0390.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Title: Static metadata for Distutils
Version: $Revision$
Last-Modified: $Date$
Author: Tarek Ziadé <tarek@ziade.org>
BDFL-Delegate: Nick Coghlan
BDFL-Delegate: Alyssa Coghlan
Discussions-To: distutils-sig@python.org
Status: Rejected
Type: Standards Track
Expand All @@ -25,7 +25,7 @@ Rejection Notice
================

As distutils2 is no longer going to be incorporated into the standard
library, this PEP was rejected by Nick Coghlan in late April, 2013.
library, this PEP was rejected by Alyssa Coghlan in late April, 2013.

A replacement PEP based on :pep:`426` (metadata 2.0) will be created that
defines the minimum amount of information needed to generate an sdist
Expand Down
2 changes: 1 addition & 1 deletion peps/pep-0394.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Title: The "python" Command on Unix-Like Systems
Version: $Revision$
Last-Modified: $Date$
Author: Kerrick Staley <mail@kerrickstaley.com>,
Nick Coghlan <ncoghlan@gmail.com>,
Alyssa Coghlan <ncoghlan@gmail.com>,
Barry Warsaw <barry@python.org>,
Petr Viktorin <encukou@gmail.com>,
Miro Hrončok <miro@hroncok.cz>,
Expand Down
2 changes: 1 addition & 1 deletion peps/pep-0395.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PEP: 395
Title: Qualified Names for Modules
Version: $Revision$
Last-Modified: $Date$
Author: Nick Coghlan <ncoghlan@gmail.com>
Author: Alyssa Coghlan <ncoghlan@gmail.com>
Status: Withdrawn
Type: Standards Track
Content-Type: text/x-rst
Expand Down
2 changes: 1 addition & 1 deletion peps/pep-0403.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PEP: 403
Title: General purpose decorator clause (aka "@in" clause)
Version: $Revision$
Last-Modified: $Date$
Author: Nick Coghlan <ncoghlan@gmail.com>
Author: Alyssa Coghlan <ncoghlan@gmail.com>
Status: Deferred
Type: Standards Track
Content-Type: text/x-rst
Expand Down
2 changes: 1 addition & 1 deletion peps/pep-0405.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Title: Python Virtual Environments
Version: $Revision$
Last-Modified: $Date$
Author: Carl Meyer <carl@oddbird.net>
BDFL-Delegate: Nick Coghlan
BDFL-Delegate: Alyssa Coghlan
Status: Final
Type: Standards Track
Topic: Packaging
Expand Down
2 changes: 1 addition & 1 deletion peps/pep-0406.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PEP: 406
Title: Improved Encapsulation of Import State
Version: $Revision$
Last-Modified: $Date$
Author: Nick Coghlan <ncoghlan@gmail.com>, Greg Slodkowicz <jergosh@gmail.com>
Author: Alyssa Coghlan <ncoghlan@gmail.com>, Greg Slodkowicz <jergosh@gmail.com>
Status: Withdrawn
Type: Standards Track
Content-Type: text/x-rst
Expand Down
2 changes: 1 addition & 1 deletion peps/pep-0408.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PEP: 408
Title: Standard library __preview__ package
Version: $Revision$
Last-Modified: $Date$
Author: Nick Coghlan <ncoghlan@gmail.com>,
Author: Alyssa Coghlan <ncoghlan@gmail.com>,
Eli Bendersky <eliben@gmail.com>
Status: Rejected
Type: Standards Track
Expand Down
2 changes: 1 addition & 1 deletion peps/pep-0411.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PEP: 411
Title: Provisional packages in the Python standard library
Version: $Revision$
Last-Modified: $Date$
Author: Nick Coghlan <ncoghlan@gmail.com>,
Author: Alyssa Coghlan <ncoghlan@gmail.com>,
Eli Bendersky <eliben@gmail.com>
Status: Superseded
Type: Informational
Expand Down
2 changes: 1 addition & 1 deletion peps/pep-0413.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PEP: 413
Title: Faster evolution of the Python Standard Library
Version: $Revision$
Last-Modified: $Date$
Author: Nick Coghlan <ncoghlan@gmail.com>
Author: Alyssa Coghlan <ncoghlan@gmail.com>
Status: Withdrawn
Type: Process
Content-Type: text/x-rst
Expand Down
4 changes: 2 additions & 2 deletions peps/pep-0414.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Title: Explicit Unicode Literal for Python 3.3
Version: $Revision$
Last-Modified: $Date$
Author: Armin Ronacher <armin.ronacher@active-4.com>,
Nick Coghlan <ncoghlan@gmail.com>
Alyssa Coghlan <ncoghlan@gmail.com>
Status: Final
Type: Standards Track
Content-Type: text/x-rst
Expand Down Expand Up @@ -102,7 +102,7 @@ Author's Note
This PEP was originally written by Armin Ronacher, and Guido's approval was
given based on that version.

The currently published version has been rewritten by Nick Coghlan to
The currently published version has been rewritten by Alyssa Coghlan to
include additional historical details and rationale that were taken into
account when Guido made his decision, but were not explicitly documented in
Armin's version of the PEP.
Expand Down
4 changes: 2 additions & 2 deletions peps/pep-0415.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Title: Implement context suppression with exception attributes
Version: $Revision$
Last-Modified: $Date$
Author: Benjamin Peterson <benjamin@python.org>
BDFL-Delegate: Nick Coghlan
BDFL-Delegate: Alyssa Coghlan
Status: Final
Type: Standards Track
Content-Type: text/x-rst
Expand All @@ -28,7 +28,7 @@ instances.
PEP Acceptance
==============

This PEP was accepted by Nick Coghlan on the 14th of May, 2012.
This PEP was accepted by Alyssa Coghlan on the 14th of May, 2012.


Rationale
Expand Down
10 changes: 5 additions & 5 deletions peps/pep-0420.rst
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ lacking an ``__init__.py`` file. Such a directory will now be
imported as a namespace package, whereas in prior Python versions an
ImportWarning would be raised.

Nick Coghlan presented a list of his objections to this proposal [4]_.
Alyssa (Nick) Coghlan presented a list of her objections to this proposal [4]_.
They are:

1. Implicit package directories go against the Zen of Python.
Expand All @@ -458,7 +458,7 @@ They are:
4. Implicit package directories will permanently entrench current
newbie-hostile behavior in ``__main__``.

Nick later gave a detailed response to his own objections [5]_, which
Alyssa later gave a detailed response to her own objections [5]_, which
is summarized here:

1. The practicality of this PEP wins over other proposals and the
Expand Down Expand Up @@ -500,7 +500,7 @@ Dynamic path computation
------------------------

Guido raised a concern that automatic dynamic path computation was an
unnecessary feature [8]_. Later in that thread, PJ Eby and Nick
unnecessary feature [8]_. Later in that thread, PJ Eby and Alyssa
Coghlan presented arguments as to why dynamic computation would
minimize surprise to Python users. The conclusion of that discussion
has been included in this PEP's Rationale section.
Expand Down Expand Up @@ -622,10 +622,10 @@ References
.. [3] PyCon 2012 Namespace Package discussion outcome
(https://mail.python.org/pipermail/import-sig/2012-March/000421.html)
.. [4] Nick Coghlan's objection to the lack of marker files or directories
.. [4] Alyssa Coghlan's objection to the lack of marker files or directories
(https://mail.python.org/pipermail/import-sig/2012-March/000423.html)
.. [5] Nick Coghlan's response to his initial objections
.. [5] Alyssa Coghlan's response to her initial objections
(https://mail.python.org/pipermail/import-sig/2012-April/000464.html)
.. [6] Martin v. Löwis's suggestion to make ``encodings`` a namespace
Expand Down
4 changes: 2 additions & 2 deletions peps/pep-0421.rst
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ Non-Required Attributes

Earlier versions of this PEP included a required attribute called
``metadata`` that held any non-required, per-implementation data
[#Nick]_. However, this proved to be an unnecessary addition
[#Alyssa]_. However, this proved to be an unnecessary addition
considering the purpose of ``sys.implementation``.

Ultimately, non-required attributes are virtually ignored in this PEP.
Expand Down Expand Up @@ -502,7 +502,7 @@ References
.. [#javatest] The use of ``os.name`` as 'java' in the stdlib test suite.
http://hg.python.org/cpython/file/2f563908ebc5/Lib/test/support.py#l512
.. [#Nick] Nick Coghlan's proposal for ``sys.implementation.metadata``:
.. [#Alyssa] Alyssa (Nick) Coghlan's proposal for ``sys.implementation.metadata``:
https://mail.python.org/pipermail/python-ideas/2012-May/014984.html
.. [#Barry] Feedback from Barry Warsaw:
Expand Down
2 changes: 1 addition & 1 deletion peps/pep-0422.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PEP: 422
Title: Simpler customisation of class creation
Version: $Revision$
Last-Modified: $Date$
Author: Nick Coghlan <ncoghlan@gmail.com>,
Author: Alyssa Coghlan <ncoghlan@gmail.com>,
Daniel Urban <urban.dani+py@gmail.com>
Status: Withdrawn
Type: Standards Track
Expand Down
Loading

0 comments on commit 7236fed

Please sign in to comment.