gh-135676: Lexical analysis: Reword String literals and related sections by encukou · Pull Request #135942 · python/cpython · GitHub

Hopefully this PR is not too big. I can split it up if that would make it easier to review.

The f-string section is untouched here; a stub is added for t-strings. I'll look at those next.

Issue: Reword the Lexical Analysis chapter of the docs #135676

📚 Documentation preview 📚: https://cpython-previews--135942.org.readthedocs.build/

Co-authored-by: Blaise Pabon <blaise@gmail.com>

Co-authored-by: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com>

Thanks! This was linked into the PEP 750 documentation TODO list so I took a look. I have one comment as it relates to t-strings; the rest of the changes are broader in scope, so I'll leave it to others to comment. (FWIW, I like the reorganization here!)

@AA-Turner, ping, do you still want to review this?

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>

Thanks @encukou for the PR 🌮🎉.. I'm working now to backport this PR to: 3.14.
🐍🍒⛏🤖

Thanks @encukou for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

… sections (pythonGH-135942) (cherry picked from commit 777159f) Co-authored-by: Petr Viktorin <encukou@gmail.com> Co-authored-by: Blaise Pabon <blaise@gmail.com> Co-authored-by: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com> Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>

Sorry, @encukou, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 777159fa318f39c36ad60039cdf35a8dbb319637 3.13

GH-137048 is a backport of this pull request to the 3.14 branch.

…d sections (GH-135942) (#137048) Co-authored-by: Petr Viktorin <encukou@gmail.com> Co-authored-by: Blaise Pabon <blaise@gmail.com> Co-authored-by: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com> Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot AMD64 FreeBSD Refleaks 3.14 (tier-3) has failed when building commit 4832cea.

What do you need to do:

Don't panic.
Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
Go to the page of the buildbot that failed (https://buildbot.python.org/#/builders/1800/builds/367) and take a look at the build logs.
Check if the failure is related to this commit (4832cea) or if it is a false positive.
If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/#/builders/1800/builds/367

Summary of the results of the build (if available):

==

Click to see traceback logs

Traceback (most recent call last):
  File "/buildbot/buildarea/3.14.ware-freebsd.refleak/build/Lib/test/support/__init__.py", line 830, in gc_collect
    gc.collect()
ResourceWarning: unclosed <socket.socket fd=10, family=2, type=1, proto=6, laddr=('127.0.0.1', 48354), raddr=('127.0.0.1', 48355)>
Task was destroyed but it is pending!
task: <Task pending name='Task-3613' coro=<BaseSelectorEventLoop._accept_connection2() done, defined at /buildbot/buildarea/3.14.ware-freebsd.refleak/build/Lib/asyncio/selector_events.py:217> wait_for=<Future pending cb=[Task.task_wakeup()]>>
Warning -- Unraisable exception
Exception ignored while calling deallocator <function _SelectorTransport.__del__ at 0x8385dc890>:
Traceback (most recent call last):
  File "/buildbot/buildarea/3.14.ware-freebsd.refleak/build/Lib/asyncio/selector_events.py", line 873, in __del__
    _warn(f"unclosed transport {self!r}", ResourceWarning, source=self)
ResourceWarning: unclosed transport <_SelectorSocketTransport closing fd=10>
k


Traceback (most recent call last):
  File "/buildbot/buildarea/3.14.ware-freebsd.refleak/build/Lib/test/support/__init__.py", line 830, in gc_collect
    gc.collect()
ResourceWarning: unclosed <socket.socket fd=9, family=2, type=1, proto=6, laddr=('127.0.0.1', 58513), raddr=('127.0.0.1', 58514)>
Task was destroyed but it is pending!
task: <Task pending name='Task-3372' coro=<BaseSelectorEventLoop._accept_connection2() done, defined at /buildbot/buildarea/3.14.ware-freebsd.refleak/build/Lib/asyncio/selector_events.py:217> wait_for=<Future pending cb=[Task.task_wakeup()]>>
Warning -- Unraisable exception
Exception ignored while calling deallocator <function _SelectorTransport.__del__ at 0x841c431d0>:
Traceback (most recent call last):
  File "/buildbot/buildarea/3.14.ware-freebsd.refleak/build/Lib/asyncio/selector_events.py", line 873, in __del__
    _warn(f"unclosed transport {self!r}", ResourceWarning, source=self)
ResourceWarning: unclosed transport <_SelectorSocketTransport closing fd=9>
k


Traceback (most recent call last):
  File "/buildbot/buildarea/3.14.ware-freebsd.refleak/build/Lib/test/support/__init__.py", line 830, in gc_collect
    gc.collect()
ResourceWarning: unclosed <socket.socket fd=10, family=2, type=1, proto=6, laddr=('127.0.0.1', 57913), raddr=('127.0.0.1', 57914)>
Task was destroyed but it is pending!
task: <Task pending name='Task-88' coro=<BaseSelectorEventLoop._accept_connection2() done, defined at /buildbot/buildarea/3.14.ware-freebsd.refleak/build/Lib/asyncio/selector_events.py:217> wait_for=<Future pending cb=[Task.task_wakeup()]>>
Warning -- Unraisable exception
Exception ignored while calling deallocator <function _SelectorTransport.__del__ at 0x841c431d0>:
Traceback (most recent call last):
  File "/buildbot/buildarea/3.14.ware-freebsd.refleak/build/Lib/asyncio/selector_events.py", line 873, in __del__
    _warn(f"unclosed transport {self!r}", ResourceWarning, source=self)
ResourceWarning: unclosed transport <_SelectorSocketTransport closing fd=10>
k

… sections (pythonGH-135942) Co-authored-by: Blaise Pabon <blaise@gmail.com> Co-authored-by: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com> Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>

Reminder about backporting. @encukou

… sections (pythonGH-135942) Co-authored-by: Blaise Pabon <blaise@gmail.com> Co-authored-by: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com> Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>

…related sections (pythonGH-135942) (python#137048) Co-authored-by: Petr Viktorin <encukou@gmail.com> Co-authored-by: Blaise Pabon <blaise@gmail.com> Co-authored-by: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com> Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>

encukou and others added 6 commits June 25, 2025 16:27

WIP: String literals

d4381aa

Co-authored-by: Blaise Pabon <blaise@gmail.com>

Use correct Pygments lexer for plain text

80ad85c

WIP

e44fa66

More WIP

86bf94b

Byte strings, raw strings; f-string stub

faf05a1

Remove outdated comment

687fe58

encukou requested review from AA-Turner and willingc as code owners June 25, 2025 14:40

bedevere-app Bot added awaiting core review docs Documentation in the Doc dir skip news labels Jun 25, 2025

github-project-automation Bot added this to Docs PRs Jun 25, 2025

github-project-automation Bot moved this to Todo in Docs PRs Jun 25, 2025

bedevere-app Bot mentioned this pull request Jun 25, 2025

Reword the Lexical Analysis chapter of the docs #135676

Open

encukou mentioned this pull request Jun 25, 2025

Write the official cpython documentation for t-strings t-strings/help#2

Open

11 tasks

StanFromIreland reviewed Jun 25, 2025

View reviewed changes

Comment thread Doc/reference/expressions.rst Outdated

encukou and others added 2 commits June 25, 2025 16:50

Fix ReST errors

9f9d29c

Update Doc/reference/expressions.rst

11e3731

Co-authored-by: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com>

davepeck reviewed Jun 27, 2025

View reviewed changes

Comment thread Doc/reference/expressions.rst Outdated

Comment thread Doc/reference/lexical_analysis.rst

encukou added 2 commits July 2, 2025 16:28

f-strings can only be concatenated with themselves

2cd9bf4

Merge in the main branch

b51b265

AA-Turner approved these changes Jul 23, 2025

View reviewed changes

bedevere-app Bot added awaiting merge and removed awaiting core review labels Jul 23, 2025

encukou and others added 4 commits July 23, 2025 17:25

Merge branch 'main' into lex-analysis-strings

5ecdc81

Apply suggestions from code review

b9c0bcd

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>

Address review

cdb9d59

Remove merge artifact

7595f08

AA-Turner approved these changes Jul 23, 2025

View reviewed changes

encukou enabled auto-merge (squash) July 23, 2025 15:55

encukou merged commit 777159f into python:main Jul 23, 2025
25 checks passed

github-project-automation Bot moved this from Todo to Done in Docs PRs Jul 23, 2025

bedevere-app Bot removed the awaiting merge label Jul 23, 2025

AA-Turner added needs backport to 3.13 bugs and security fixes needs backport to 3.14 bugs and security fixes labels Jul 23, 2025

miss-islington-app Bot assigned encukou Jul 23, 2025

bedevere-app Bot removed the needs backport to 3.14 bugs and security fixes label Jul 23, 2025

encukou deleted the lex-analysis-strings branch July 23, 2025 16:08

AA-Turner mentioned this pull request Aug 4, 2025

gh-132661: PEP 750 documentation: second pass #137020

Merged

encukou mentioned this pull request Aug 6, 2025

gh-135676: Reword the f-string (and t-string) section #137469

Merged

encukou removed the needs backport to 3.13 bugs and security fixes label Aug 15, 2025

gh-135676: Lexical analysis: Reword String literals and related sections by encukou · Pull Request #135942 · python/cpython · GitHub

Uh oh!

Uh oh!

gh-135676: Lexical analysis: Reword String literals and related sections - #135942

gh-135676: Lexical analysis: Reword String literals and related sections#135942encukou merged 14 commits intopython:mainpython/cpython:mainfrom encukou:lex-analysis-stringsencukou/cpython:lex-analysis-stringsCopy head branch name to clipboard

Conversation

encukou commented Jun 25, 2025 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

davepeck left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

encukou commented Jul 9, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

miss-islington-app Bot commented Jul 23, 2025

Uh oh!

miss-islington-app Bot commented Jul 23, 2025

Uh oh!

miss-islington-app Bot commented Jul 23, 2025

Uh oh!

bedevere-app Bot commented Jul 23, 2025

Uh oh!

bedevere-bot commented Jul 23, 2025

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Uh oh!

serhiy-storchaka commented Aug 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

gh-135676: Lexical analysis: Reword String literals and related sections#135942
encukou merged 14 commits into
python:mainfrom
encukou:lex-analysis-strings

encukou commented Jun 25, 2025 •
edited by github-actions Bot
Loading

davepeck left a comment •
edited
Loading