Fix: missing and redundant spacing (and etc) for console output on building #8277
Conversation
This file contains 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
…ilding. Before this fixing: ``` generating indices... genindexdone writing additional pages... searchdone copying static files... ... done ``` After this fixing: ``` generating indices... genindex done writing additional pages... search done copying static files... done ``` This tiny trouble has been introduced at sphinx-doc#6538 (sphinx-2.0.0 Mar 29, 2019)
shimizukawa
commented
Oct 3, 2020
| @@ -641,17 +641,17 @@ def gen_pages_from_extensions(self) -> None: | |||
| def gen_additional_pages(self) -> None: | |||
| # additional pages from conf.py | |||
| for pagename, template in self.config.html_additional_pages.items(): | |||
| logger.info(' ' + pagename, nonl=True) | |||
| logger.info(pagename + ' ', nonl=True) | |||
There was a problem hiding this comment.
@progress_message decorator uses "after spacing" model, so logger output inside the decorator should use same model.
sphinx/sphinx/util/__init__.py
Lines 691 to 707 in ae7c4cc
| self.handle_page(pagename, {}, template) | ||
|
|
||
| # the search page | ||
| if self.search: | ||
| logger.info(' search', nonl=True) | ||
| logger.info('search ', nonl=True) |
| self.handle_page('search', {}, 'search.html') | ||
|
|
||
| # the opensearch xml file | ||
| if self.config.html_use_opensearch and self.search: | ||
| logger.info(' opensearch', nonl=True) | ||
| logger.info('opensearch ', nonl=True) |
| @@ -669,7 +669,7 @@ def write_genindex(self) -> None: | |||
| 'genindexcounts': indexcounts, | |||
| 'split_index': self.config.html_split_index, | |||
| } | |||
| logger.info(' genindex', nonl=True) | |||
| logger.info('genindex ', nonl=True) | |||
| @@ -691,7 +691,7 @@ def write_domain_indices(self) -> None: | |||
| 'content': content, | |||
| 'collapse_index': collapse, | |||
| } | |||
| logger.info(' ' + indexname, nonl=True) | |||
| logger.info(indexname + ' ', nonl=True) | |||
| @@ -785,7 +785,7 @@ def copy_html_favicon(self) -> None: | |||
|
|
|||
| def copy_static_files(self) -> None: | |||
| try: | |||
| with progress_message(__('copying static files... ')): | |||
| with progress_message(__('copying static files')): | |||
There was a problem hiding this comment.
removing redundant ... .
Already progress_message with context automatically emits ... .
tk0miya
approved these changes
Oct 4, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Feature or Bugfix
Purpose
Fixing console output on building
done......after...Detail
Before this fixing:
After this fixing:
Relates
This tiny trouble has been introduced at #6538 (sphinx-2.0.0 Mar 29, 2019)