10000 Docs: Fix Sphinx warnings in logging.rst by erlend-aasland · Pull Request #108139 · python/cpython · GitHub
[go: up one dir, main page]

Skip to content

Docs: Fix Sphinx warnings in logging.rst #108139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 20, 2023

Conversation

erlend-aasland
Copy link
Contributor
@erlend-aasland erlend-aasland commented Aug 19, 2023
  • Add missing markup to some methods
  • Silence links to __init__ methods

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

- Add missing markup to some methods
- Silence links to __init__ methods
Comment on lines 1034 to 1045
to :class:`LoggerAdapter`. These methods delegate to the underlying logger.

.. versionchanged:: 3.6
Attribute :attr:`manager` and method :meth:`_log` were added, which
Attribute :attr:`!manager` and method :meth:`!_log` were added, which
delegate to the underlying logger and allow adapters to be nested.

.. versionchanged:: 3.13
Remove the undocumented ``warn()`` method which was an alias to the
``warning()`` method.
Remove the undocumented :meth:`!warn`` method which was an alias to the
:meth:`!warning` method.

.. versionchanged:: 3.13
The *merge_extra* argument was added.
Copy link
Member

Choose a reason for hiding this comment

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

This entire section (starting "In addition to the above ...") should be indented by 3 spaces to fall under .. class:: LoggerAdapter

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed; good observation!

Copy link
Member

Choose a reason for hiding this comment

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

There was another paragraph needing indentation, I've pushed a commit to fix (hope you don't mind!)

A

@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

Sorry, @erlend-aasland and @vsajip, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker c735e79afb62324624864e1943f84825249f58ed 3.12

@miss-islington
Copy link
Contributor

Sorry, @erlend-aasland and @vsajip, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker c735e79afb62324624864e1943f84825249f58ed 3.11

@erlend-aasland erlend-aasland deleted the docs/cleanup-logging.rst branch August 20, 2023 15:48
@bedevere-bot
Copy link

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

@bedevere-bot bedevere-bot removed the needs backport to 3.12 only security fixes label Aug 20, 2023
erlend-aasland added a commit to erlend-aasland/cpython that referenced this pull request Aug 20, 2023
(cherry picked from commit c735e79)

Co-authored-by: Adam Turner <9087854+aa-turner@users.noreply.github.com>
@bedevere-bot
Copy link

GH-108175 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 Aug 20, 2023
erlend-aasland added a commit to erlend-aasland/cpython that referenced this pull request Aug 20, 2023
(cherry picked from commit c735e79)

Co-authored-by: Adam Turner <9087854+aa-turner@users.noreply.github.com>
@bedevere-bot

This comment was marked as off-topic.

erlend-aasland added a commit that referenced this pull request Aug 20, 2023
(cherry picked from commit c735e79)

Co-authored-by: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Yhg1s pushed a commit that referenced this pull request Aug 20, 2023
(cherry picked from commit c735e79)

Co-authored-by: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants
0