◐ Shell
reader mode source ↗
Skip to content

gh-98172: Fix formatting in except* docs#98173

Merged
JelleZijlstra merged 2 commits into
mainfrom
JelleZijlstra-patch-1
Oct 11, 2022
Merged

gh-98172: Fix formatting in except* docs#98173
JelleZijlstra merged 2 commits into
mainfrom
JelleZijlstra-patch-1

Conversation

@JelleZijlstra

@JelleZijlstra JelleZijlstra commented Oct 11, 2022 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

@JelleZijlstra JelleZijlstra mentioned this pull request Oct 11, 2022
Closed
@JelleZijlstra JelleZijlstra added the needs backport to 3.11 only security fixes label Oct 11, 2022
iritkatriel
iritkatriel approved these changes Oct 11, 2022
View reviewed changes

@iritkatriel iritkatriel left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hide comment

I can’t test this at the moment (AFK) but I trust you. If you want another review perhaps a docs expert?

AA-Turner
AA-Turner approved these changes Oct 11, 2022
View reviewed changes

@AA-Turner AA-Turner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hide comment

Looks good

A

@JelleZijlstra

JelleZijlstra commented Oct 11, 2022

Copy link
Copy Markdown
Member Author

Screen Shot 2022-10-11 at 7 30 49 AM

@JelleZijlstra

JelleZijlstra commented Oct 11, 2022

Copy link
Copy Markdown
Member Author

I feel like we should remove the >>> at the end of the code block too. Several similar blocks in the file don't have that.

@JelleZijlstra JelleZijlstra merged commit 5ecf961 into main Oct 11, 2022
@JelleZijlstra JelleZijlstra deleted the JelleZijlstra-patch-1 branch October 11, 2022 16:13
@miss-islington

miss-islington commented Oct 11, 2022

Copy link
Copy Markdown
Contributor

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

@miss-islington

miss-islington commented Oct 11, 2022

Copy link
Copy Markdown
Contributor

Sorry @JelleZijlstra, I had trouble checking out the 3.11 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 5ecf961640192a2192383aa20e1e93dcdf23c9b6 3.11

@JelleZijlstra JelleZijlstra added needs backport to 3.11 only security fixes and removed needs backport to 3.11 only security fixes labels Oct 11, 2022
@miss-islington

miss-islington commented Oct 11, 2022

Copy link
Copy Markdown
Contributor

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 11, 2022
@JelleZijlstra @miss-islington
pythongh-98172: Fix formatting in except* docs (pythonGH-98173) …
7b71792 
(cherry picked from commit 5ecf961)

Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
@bedevere-bot

bedevere-bot commented Oct 11, 2022

Copy link
Copy Markdown

GH-98187 is a backport of this pull request to the 3.11 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Oct 11, 2022
miss-islington added a commit that referenced this pull request Oct 11, 2022
@miss-islington @JelleZijlstra
gh-98172: Fix formatting in except* docs (GH-98173) …
9b12084 
(cherry picked from commit 5ecf961)

Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
carljm added a commit to carljm/cpython that referenced this pull request Oct 14, 2022
@carljm
Merge branch 'main' into typewatch …
6e53514 
* main: (38 commits)
  pythongh-98251: Allow venv to pass along PYTHON* variables to pip and ensurepip when they do not impact path resolution (pythonGH-98259)
  Bpo-41246: IOCP Proactor avoid callback code duplication (python#21399)
  bpo-46364: Use sockets for stdin of asyncio only on AIX (python#30596)
  pythongh-98178: syslog() is not thread-safe on macOS (python#98213)
  Mark all targets in `Doc/Makefile` as `PHONY` (pythonGH-98189)
  pythongh-97982: Factorize PyUnicode_Count() and unicode_count() code (python#98025)
  pythongh-96265: Formatting changes for faq/general (python#98129)
  tutorial: remove "with single quotes" (python#98204)
  pythongh-97669: Remove Tools/scripts/startuptime.py (python#98214)
  signalmodule.c uses _PyErr_WriteUnraisableMsg() (python#98217)
  pythongh-97669: Fix test_tools reference leak (python#98216)
  pythongh-97669: Create Tools/patchcheck/ directory (python#98186)
  pythongh-65046: Link to logging cookbook from asyncio docs (python#98207)
  Formatting fixes in contextlib docs (python#98111)
  pythongh-95276: Add callable entry to the glossary (python#95738)
  pythongh-96130: Rephrase use of "typecheck" verb for clarity (python#98144)
  Fix some incorrect indentation around the main switch (python#98177)
  pythongh-98172: Fix formatting in `except*` docs (python#98173)
  pythongh-97982: Remove asciilib_count() (python#98164)
  pythongh-95756: Free and NULL-out code caches when needed (pythonGH-98181)
  ...
carljm added a commit to carljm/cpython that referenced this pull request Oct 14, 2022
@carljm
Merge branch 'main' into cached_property …
0bb0c69 
* main: (37 commits)
  pythongh-98251: Allow venv to pass along PYTHON* variables to pip and ensurepip when they do not impact path resolution (pythonGH-98259)
  Bpo-41246: IOCP Proactor avoid callback code duplication (python#21399)
  bpo-46364: Use sockets for stdin of asyncio only on AIX (python#30596)
  pythongh-98178: syslog() is not thread-safe on macOS (python#98213)
  Mark all targets in `Doc/Makefile` as `PHONY` (pythonGH-98189)
  pythongh-97982: Factorize PyUnicode_Count() and unicode_count() code (python#98025)
  pythongh-96265: Formatting changes for faq/general (python#98129)
  tutorial: remove "with single quotes" (python#98204)
  pythongh-97669: Remove Tools/scripts/startuptime.py (python#98214)
  signalmodule.c uses _PyErr_WriteUnraisableMsg() (python#98217)
  pythongh-97669: Fix test_tools reference leak (python#98216)
  pythongh-97669: Create Tools/patchcheck/ directory (python#98186)
  pythongh-65046: Link to logging cookbook from asyncio docs (python#98207)
  Formatting fixes in contextlib docs (python#98111)
  pythongh-95276: Add callable entry to the glossary (python#95738)
  pythongh-96130: Rephrase use of "typecheck" verb for clarity (python#98144)
  Fix some incorrect indentation around the main switch (python#98177)
  pythongh-98172: Fix formatting in `except*` docs (python#98173)
  pythongh-97982: Remove asciilib_count() (python#98164)
  pythongh-95756: Free and NULL-out code caches when needed (pythonGH-98181)
  ...
pablogsal pushed a commit that referenced this pull request Oct 22, 2022
@miss-islington @JelleZijlstra @pablogsal
gh-98172: Fix formatting in except* docs (GH-98173) …
e0260d0 
(cherry picked from commit 5ecf961)

Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@iritkatriel iritkatriel iritkatriel approved these changes

@AA-Turner AA-Turner AA-Turner approved these changes

Assignees

@JelleZijlstra JelleZijlstra

Labels

docs Documentation in the Doc dir skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@JelleZijlstra @miss-islington @bedevere-bot @iritkatriel @AA-Turner