◐ Shell
reader mode source ↗
Skip to content

Fix c-api/file.rst indexes#114608

Merged
serhiy-storchaka merged 2 commits into
python:mainfrom
sobolevn:issue-114546
Jan 27, 2024
Merged

Fix c-api/file.rst indexes#114608
serhiy-storchaka merged 2 commits into
python:mainfrom
sobolevn:issue-114546

Conversation

@sobolevn

@sobolevn sobolevn commented Jan 26, 2024 •
edited by github-actions Bot
Loading

Copy link
Copy Markdown
Member

It is now:
Снимок экрана 2024-01-26 в 18 48 18

Fixes #114546

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

@bedevere-app bedevere-app Bot added awaiting review docs Documentation in the Doc dir skip news labels Jan 26, 2024
serhiy-storchaka
serhiy-storchaka reviewed Jan 26, 2024
View reviewed changes

@serhiy-storchaka serhiy-storchaka 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

You can also use .. c:namespace:: NULL.

@sobolevn

sobolevn commented Jan 26, 2024

Copy link
Copy Markdown
Member Author

Which one would you prefer: the current or .. c:namespace:: NULL?

@serhiy-storchaka

serhiy-storchaka commented Jan 26, 2024

Copy link
Copy Markdown
Member

What do you prefer? I slightly prefer your initial layout, i.e. documenting Py_OpenCodeHookFunction "inside" the documentation for PyFile_SetOpenCodeHook, since the former is only used in the latter.

@sobolevn

sobolevn commented Jan 26, 2024

Copy link
Copy Markdown
Member Author

After comparing both, I am returning the initial layout, it is much easier to read 👍

serhiy-storchaka
serhiy-storchaka approved these changes Jan 27, 2024
View reviewed changes

@serhiy-storchaka serhiy-storchaka 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

LGTM.

@bedevere-app bedevere-app Bot added awaiting merge and removed labels Jan 27, 2024
@serhiy-storchaka serhiy-storchaka added needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes labels Jan 27, 2024
@serhiy-storchaka serhiy-storchaka merged commit 23fb9f0 into python:main Jan 27, 2024
@miss-islington-app

miss-islington-app Bot commented Jan 27, 2024

Copy link
Copy Markdown

Thanks @sobolevn for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Jan 27, 2024

Copy link
Copy Markdown

Sorry, @sobolevn and @serhiy-storchaka, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 23fb9f0777b054526b3b32f58e60b2a03132bf45 3.12

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jan 27, 2024
@sobolevn @miss-islington
Fix c-api/file.rst indexes (pythonGH-114608) …
87e2a1e 
(cherry picked from commit 23fb9f0)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
@bedevere-app

bedevere-app Bot commented Jan 27, 2024

Copy link
Copy Markdown

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

@bedevere-app bedevere-app Bot removed the needs backport to 3.11 only security fixes label Jan 27, 2024
serhiy-storchaka pushed a commit that referenced this pull request Jan 27, 2024
@miss-islington @sobolevn
[3.11] Fix c-api/file.rst indexes (GH-114608) (GH-114639) …
b323d99 
(cherry picked from commit 23fb9f0)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
aisk pushed a commit to aisk/cpython that referenced this pull request Feb 11, 2024
@sobolevn @aisk
Fix c-api/file.rst indexes (pythonGH-114608)
2bf6a83
Glyphack pushed a commit to Glyphack/cpython that referenced this pull request Sep 2, 2024
@sobolevn @Glyphack
Fix c-api/file.rst indexes (pythonGH-114608)
39e669a
@serhiy-storchaka

serhiy-storchaka commented Sep 29, 2024

Copy link
Copy Markdown
Member

@sobolevn, this was backported to 3.11, but not to 3.12. Do you mind to make a backport?

@sobolevn

sobolevn commented Sep 29, 2024

Copy link
Copy Markdown
Member Author

Will do

sobolevn added a commit to sobolevn/cpython that referenced this pull request Sep 30, 2024
@sobolevn
[3.12] Fix c-api/file.rst indexes (pythonGH-114608) …
c054de0 
(cherry picked from commit 23fb9f0)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
@bedevere-app

bedevere-app Bot commented Sep 30, 2024

Copy link
Copy Markdown

GH-124786 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.12 only security fixes label Sep 30, 2024
sobolevn added a commit that referenced this pull request Sep 30, 2024
@sobolevn
[3.12] Fix c-api/file.rst indexes (GH-114608) (#124786) …
f9cce95 
(cherry picked from commit 23fb9f0)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

@hugovk hugovk Awaiting requested review from hugovk

Assignees

@serhiy-storchaka serhiy-storchaka

Labels

docs Documentation in the Doc dir skip issue skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sobolevn @serhiy-storchaka