Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[2.7] bpo-29521: Fix two minor documentation build warnings (GH-41) #670

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
Apr 10, 2017

Conversation

Mariatta
Copy link
Member

(cherry picked from commit 3d707be)

Much of bpo-29521 was fixed in parallel with commit
e7ffb99 .  This cleans up the rest.

Apply parallel change to Doc/make.bat to read
"set SPHINXOPTS=-D latex_elements.papersize="
I don't have a Windows system on which to observe the warning,
but it should be necessary.

The warning:

.../workspace/cpython_github/Doc/faq/windows.rst:303:
    WARNING: unknown option: -t

In the Windows FAQ, `How do I keep editors from inserting tabs
into my Python source?`, contained a reference to a Python -t
option. In Python 2.x, this caused Python to issue warnings
about lines with mixed spaces and tabs, but as of Python 3.6
it does nothing.

Per discussion at http://bugs.python.org/issue29387, take
their wording. Python [3] raises an IndentationError or
TabError. Tabnanny is now a module.
(cherry picked from commit 3d707be)
@Mariatta Mariatta changed the title [2.7] bpo-29521 Fix two minor documentation build warnings (GH-41) [2.7] bpo-29521: Fix two minor documentation build warnings (GH-41) Mar 15, 2017
run Python with the :option:`-t` switch or run ``Tools/Scripts/tabnanny.py`` to
check a directory tree in batch mode.
Python raises :exc:`IndentationError` or :exc:`TabError` if mixed tabs
and spaces are causing problems in leading whitespace.
Copy link
Member

Choose a reason for hiding this comment

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

In Python 2, you only get exceptions if you enable the "-tt" option. There shouldn’t be any Sphinx warning for Python 2.

@Mariatta Mariatta changed the title [2.7] bpo-29521: Fix two minor documentation build warnings (GH-41) wip [2.7] bpo-29521: Fix two minor documentation build warnings (GH-41) Mar 16, 2017
@Mariatta Mariatta changed the title wip [2.7] bpo-29521: Fix two minor documentation build warnings (GH-41) [2.7] bpo-29521: Fix two minor documentation build warnings (GH-41) Mar 17, 2017
@Mariatta
Copy link
Member Author

@vadmium I cleaned up the trailing whitespace that travis build was complaining about.
Is this ok to merge now? Thanks :)

@vadmium
Copy link
Member

vadmium commented Mar 17, 2017

Sorry I was actually talking about the original warning that I reported https://bugs.python.org/issue29387:

faq/windows.rst:303: WARNING: unknown option: -t

This pull request is for the 2.7 branch. As far as I remember, the above warning should not be present on the 2.7 branch, because the “-t” option is useful and is documented at https://docs.python.org/2.7/using/cmdline.html#cmdoption-t. Plus the new text is wrong: by default, Python 2 will accept code with mixed tabs and spaces in some cases.

I suggest just fixing the second half of the sentence:

If you suspect mixed tabs and spaces are causing problems in leading whitespace,
run Python with the :option:`-t` switch or run the :mod:`tabnanny` module to
check a directory tree in batch mode.

(I would have done this myself, but I haven’t caught up with all the Git Hub changes.)

@Mariatta
Copy link
Member Author

@vadmium I updated the wordings as suggested. Please let me know if this works :)

@vadmium
Copy link
Member

vadmium commented Mar 31, 2017

The tabnanny change looks fine to me. I have no idea if the Sphinx config is appropriate for 2.7 though.

@Mariatta Mariatta merged commit e0cba5b into python:2.7 Apr 10, 2017
@Mariatta Mariatta deleted the 3d707be-2.7 branch April 10, 2017 17:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants