IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.7'

Browse Source
This commit is contained in:
Takeshi KOMIYA 2018-08-19 23:20:33 +09:00
commit ffc6e1d552
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CHANGES
View File

@ -237,7 +237,7 @@ Documentation
* #5083: Fix wrong make.bat option for internationalization. * #5083: Fix wrong make.bat option for internationalization.
* #5115: napoleon: add admonitions added by #4613 to the docs. * #5115: napoleon: add admonitions added by #4613 to the docs.
Release 1.7.7 (in development) Release 1.7.8 (in development)
============================== ==============================
Dependencies Dependencies
@ -255,6 +255,15 @@ Features added
Bugs fixed Bugs fixed
---------- ----------
Testing
--------
Release 1.7.7 (released Aug 19, 2018)
=====================================
Bugs fixed
----------
* #5198: document not in toctree warning when including files only for parallel * #5198: document not in toctree warning when including files only for parallel
builds builds
* LaTeX: reduce "Token not allowed in a PDF string" hyperref warnings in latex * LaTeX: reduce "Token not allowed in a PDF string" hyperref warnings in latex
@ -271,9 +280,7 @@ Bugs fixed
* #5211: autodoc: No docs generated for functools.partial functions * #5211: autodoc: No docs generated for functools.partial functions
* #5306: autodoc: ``getargspec()`` raises NameError for invalid typehints * #5306: autodoc: ``getargspec()`` raises NameError for invalid typehints
* #5298: imgmath: math_number_all causes equations to have two numbers in html * #5298: imgmath: math_number_all causes equations to have two numbers in html
* #5294: sphinx-quickstart blank prompts in PowerShell
Testing
--------
Release 1.7.6 (released Jul 17, 2018) Release 1.7.6 (released Jul 17, 2018)
===================================== =====================================

8
sphinx/cmd/quickstart.py
View File

@ -80,6 +80,12 @@ DEFAULTS = {
PROMPT_PREFIX = '> ' PROMPT_PREFIX = '> '
if sys.platform == 'win32':
# On Windows, show questions as bold because of color scheme of PowerShell (refs: #5294).
COLOR_QUESTION = 'bold'
else:
COLOR_QUESTION = 'purple'
# function to get input from terminal -- overridden by the test suite # function to get input from terminal -- overridden by the test suite
def term_input(prompt): def term_input(prompt):
@ -191,7 +197,7 @@ def do_prompt(text, default=None, validator=nonempty):
prompt = prompt.encode('utf-8') prompt = prompt.encode('utf-8')
except UnicodeEncodeError: except UnicodeEncodeError:
prompt = prompt.encode('latin1') prompt = prompt.encode('latin1')
prompt = colorize('purple', prompt, input_mode=True) prompt = colorize(COLOR_QUESTION, prompt, input_mode=True)
x = term_input(prompt).strip() x = term_input(prompt).strip()
if default and not x: if default and not x:
x = default x = default