Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 05:31:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

bpo-35088: Update idlelib.help.copy_string docstring (#10164)

Browse source 
We now use git and backporting instead of hg and forward merging.
This commit is contained in:
Terry Jan Reedy 2018-10-28 01:29:00 -04:00 • committed by GitHub
parent db40cb50eb
commit 2b555fc1f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Lib/idlelib/help.py
View file

@ -240,25 +240,25 @@ def __init__(self, parent, filename, title):
def copy_strip(): def copy_strip():
"""Copy idle.html to idlelib/help.html, stripping trailing whitespace. """Copy idle.html to idlelib/help.html, stripping trailing whitespace.
Files with trailing whitespace cannot be pushed to the hg cpython Files with trailing whitespace cannot be pushed to the git cpython
repository. For 3.x (on Windows), help.html is generated, after repository. For 3.x (on Windows), help.html is generated, after
editing idle.rst in the earliest maintenance version, with editing idle.rst on the master branch, with
sphinx-build -bhtml . build/html sphinx-build -bhtml . build/html
python_d.exe -c "from idlelib.help import copy_strip; copy_strip()" python_d.exe -c "from idlelib.help import copy_strip; copy_strip()"
After refreshing TortoiseHG workshop to generate a diff, Check build/html/library/idle.html, the help.html diff, and the text
check both the diff and displayed text. Push the diff along with displayed by Help => IDLE Help. Add a blurb and create a PR.
the idle.rst change and merge both into default (or an intermediate
maintenance version).
When the 'earlist' version gets its final maintenance release, It can be worthwhile to occasionally generate help.html without
do an update as described above, without editing idle.rst, to touching idle.rst. Changes to the master version and to the doc
rebase help.html on the next version of idle.rst. Do not worry build system may result in changes that should not changed
about version changes as version is not displayed. Examine other the displayed text, but might break HelpParser.
changes and the result of Help -> IDLE Help.
If maintenance and default versions of idle.rst diverge, and As long as master and maintenance versions of idle.rst remain the
merging does not go smoothly, then consider generating same, help.html can be backported. The internal Python version
separate help.html files from separate idle.htmls. number is not displayed. If maintenance idle.rst diverges from
the master version, then instead of backporting help.html from
master, repeat the proceedure above to generate a maintenance
version.
""" """
src = join(abspath(dirname(dirname(dirname(__file__)))), src = join(abspath(dirname(dirname(dirname(__file__)))),
'Doc', 'build', 'html', 'library', 'idle.html') 'Doc', 'build', 'html', 'library', 'idle.html')

2
Misc/NEWS.d/next/IDLE/2018-10-28-00-54-32.bpo-35088.r1lJZd.rst Normal file
View file

@ -0,0 +1,2 @@
Update idlelib.help.copy_string docstring. We now use git and backporting
instead of hg and forward merging.