bpo-38022: IDLE: upgrade help.html to sphinx 2.x HTML5 output#15664
Merged
terryjreedy merged 1 commit intopython:masterfrom Sep 3, 2019
Merged
bpo-38022: IDLE: upgrade help.html to sphinx 2.x HTML5 output#15664terryjreedy merged 1 commit intopython:masterfrom
terryjreedy merged 1 commit intopython:masterfrom
Conversation
terryjreedy
approved these changes
Sep 3, 2019
Member
There was a problem hiding this comment.
Thank you for this. I compared new output to 3.8 and the only change is the fix of not double spacing after code (pre) blocks. The code change is clear. I will merge and backport.
# I will follow with a separate no-issue, no-news PR to fix comments with caps and periods.
Contributor
|
Thanks @taleinat for the PR, and @terryjreedy for merging it 🌮🎉.. I'm working now to backport this PR to: 3.7, 3.8. |
Contributor
|
I'm having trouble backporting to |
|
GH-15667 is a backport of this pull request to the 3.7 branch. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Sep 3, 2019
…GH-15664) The HTML5 output from Sphinx 2.x adds '<p>' tags within list elements. Using a new prevtag attribute, ignore these instead of emitting unwanted '\n\n'. Also stop looking for 'first' classes on tags (no longer present) and fix the bug of double-spacing instead of single spacing after <pre> blocks. (cherry picked from commit 580bdb0) Co-authored-by: Tal Einat <taleinat+github@gmail.com>
Contributor
|
Thanks @taleinat for the PR, and @terryjreedy for merging it 🌮🎉.. I'm working now to backport this PR to: 3.8. |
|
GH-15668 is a backport of this pull request to the 3.8 branch. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Sep 3, 2019
…GH-15664) The HTML5 output from Sphinx 2.x adds '<p>' tags within list elements. Using a new prevtag attribute, ignore these instead of emitting unwanted '\n\n'. Also stop looking for 'first' classes on tags (no longer present) and fix the bug of double-spacing instead of single spacing after <pre> blocks. (cherry picked from commit 580bdb0) Co-authored-by: Tal Einat <taleinat+github@gmail.com>
Contributor
|
Thanks @taleinat for the PR, and @terryjreedy for merging it 🌮🎉.. I'm working now to backport this PR to: 3.8. |
miss-islington
added a commit
that referenced
this pull request
Sep 3, 2019
The HTML5 output from Sphinx 2.x adds '<p>' tags within list elements. Using a new prevtag attribute, ignore these instead of emitting unwanted '\n\n'. Also stop looking for 'first' classes on tags (no longer present) and fix the bug of double-spacing instead of single spacing after <pre> blocks. (cherry picked from commit 580bdb0) Co-authored-by: Tal Einat <taleinat+github@gmail.com>
miss-islington
added a commit
that referenced
this pull request
Sep 3, 2019
The HTML5 output from Sphinx 2.x adds '<p>' tags within list elements. Using a new prevtag attribute, ignore these instead of emitting unwanted '\n\n'. Also stop looking for 'first' classes on tags (no longer present) and fix the bug of double-spacing instead of single spacing after <pre> blocks. (cherry picked from commit 580bdb0) Co-authored-by: Tal Einat <taleinat+github@gmail.com>
lisroach
pushed a commit
to lisroach/cpython
that referenced
this pull request
Sep 10, 2019
…GH-15664) The HTML5 output from Sphinx 2.x adds '<p>' tags within list elements. Using a new prevtag attribute, ignore these instead of emitting unwanted '\n\n'. Also stop looking for 'first' classes on tags (no longer present) and fix the bug of double-spacing instead of single spacing after <pre> blocks.
DinoV
pushed a commit
to DinoV/cpython
that referenced
this pull request
Jan 14, 2020
…GH-15664) The HTML5 output from Sphinx 2.x adds '<p>' tags within list elements. Using a new prevtag attribute, ignore these instead of emitting unwanted '\n\n'. Also stop looking for 'first' classes on tags (no longer present) and fix the bug of double-spacing instead of single spacing after <pre> blocks.
websurfer5
pushed a commit
to websurfer5/cpython
that referenced
this pull request
Jul 20, 2020
…GH-15664) The HTML5 output from Sphinx 2.x adds '<p>' tags within list elements. Using a new prevtag attribute, ignore these instead of emitting unwanted '\n\n'. Also stop looking for 'first' classes on tags (no longer present) and fix the bug of double-spacing instead of single spacing after <pre> blocks.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is done by making
HelpParserproperly handle the slightly different HTML. This required two changes:<p>tags inside list items (e.g.<li>). This is achieved by avoiding starting a new block of text for<p>tags if they come after an opening tag.<pre>tags. This is requried because<pre>tags need a newline at the end for them to be displayed properly. Achieved by adding only a single newline if the previous line is empty or entirely white-space.Also, note the removal of the
class_ != 'first'check for<p>tags. This is because the new HTML output no longer includes "first" classes on tags.https://bugs.python.org/issue38022