Skip to content

Commit 4e07868

Browse files
committed
Merge branch 'main' into inlinecomp
* main: PEP 8: Allow both one and two spaces after period (python#3027) Meta: Further tweak PR template titles to get the right order (python#3001)
2 parents 278dcaa + 6d182da commit 4e07868

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/PULL_REQUEST_TEMPLATE/Propose a new PEP.md renamed to .github/PULL_REQUEST_TEMPLATE/Add a new PEP.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ If your PEP is not Standards Track, remove the corresponding section.
1313
* [ ] File created from the [latest PEP template](https://github.com/python/peps/blob/main/pep-0012/pep-NNNN.rst?plain=1)
1414
* [ ] PEP has next available number, & set in filename (``pep-NNNN.rst``), PR title (``PEP 123: <Title of PEP>``) and ``PEP`` header
1515
* [ ] Title clearly, accurately and concisely describes the content in 79 characters or less
16-
* [ ] ``PEP``, ``Title``, ``Author``, ``Status`` (``Draft``), ``Type`` and ``Created`` headers filled out correctly
16+
* [ ] Core dev/PEP editor listed as ``Author`` or ``Sponsor``, and formally confirmed their approval
17+
* [ ] ``Author``, ``Status`` (``Draft``), ``Type`` and ``Created`` headers filled out correctly
1718
* [ ] ``PEP-Delegate``, ``Topic``, ``Requires`` and ``Replaces`` headers completed if appropriate
18-
* [ ] Core dev/PEP editor listed as author or sponsor, and formally confirmed their approval
1919
* [ ] Required sections included
2020
* [ ] Abstract (first section)
2121
* [ ] Copyright (last section; exact wording from template required)
@@ -37,6 +37,6 @@ If your PEP is not Standards Track, remove the corresponding section.
3737
* [ ] Reference Implementation
3838
* [ ] Rejected Ideas
3939
* [ ] Open Issues
40-
* [ ] ``Python-Version`` set to valid (pre-beta) future Python version
41-
* [ ] Any project stated in the PEP as supporting/endorsing/benefiting from it confirms such
40+
* [ ] ``Python-Version`` set to valid (pre-beta) future Python version, if relevant
41+
* [ ] Any project stated in the PEP as supporting/endorsing/benefiting from the PEP formally confirmed such
4242
* [ ] Right before or after initial merging, [PEP discussion thread](https://peps.python.org/pep-0001/#discussing-a-pep) created and linked to in ``Discussions-To`` and ``Post-History``
File renamed without changes.
File renamed without changes.

pep-0008.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -705,8 +705,8 @@ letter (never alter the case of identifiers!).
705705
Block comments generally consist of one or more paragraphs built out of
706706
complete sentences, with each sentence ending in a period.
707707

708-
You should use two spaces after a sentence-ending period in multi-
709-
sentence comments, except after the final sentence.
708+
You should use one or two spaces after a sentence-ending period in
709+
multi-sentence comments, except after the final sentence.
710710

711711
Ensure that your comments are clear and easily understandable to other
712712
speakers of the language you are writing in.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy