mirror of
https://github.com/sphinx-doc/sphinx.git
synced 2025-02-25 18:55:22 -06:00
fix: sphinx-quickstart asks again and again Y|N because input() return value with extra '\r' on Python-3.2.0 + Windows. closes #1043
This commit is contained in:
parent
f24b1998f2
commit
e9c0582713
@ -824,7 +824,7 @@ def do_prompt(d, key, text, default=None, validator=nonempty):
|
|||||||
prompt = purple(PROMPT_PREFIX + '%s [%s]: ' % (text, default))
|
prompt = purple(PROMPT_PREFIX + '%s [%s]: ' % (text, default))
|
||||||
else:
|
else:
|
||||||
prompt = purple(PROMPT_PREFIX + text + ': ')
|
prompt = purple(PROMPT_PREFIX + text + ': ')
|
||||||
x = term_input(prompt)
|
x = term_input(prompt).strip()
|
||||||
if default and not x:
|
if default and not x:
|
||||||
x = default
|
x = default
|
||||||
if not isinstance(x, unicode):
|
if not isinstance(x, unicode):
|
||||||
|
@ -46,6 +46,25 @@ def teardown_module():
|
|||||||
coloron()
|
coloron()
|
||||||
|
|
||||||
|
|
||||||
|
def test_quickstart_inputstrip():
|
||||||
|
d = {}
|
||||||
|
answers = {
|
||||||
|
'Q1': 'Y\r', # input() return with '\r' on Python-3.2.0 for Windows
|
||||||
|
'Q2': ' Yes \r',
|
||||||
|
'Q3': 'N',
|
||||||
|
'Q4': 'N ',
|
||||||
|
}
|
||||||
|
qs.term_input = mock_raw_input(answers)
|
||||||
|
qs.do_prompt(d, 'k1', 'Q1')
|
||||||
|
assert d['k1'] == 'Y'
|
||||||
|
qs.do_prompt(d, 'k2', 'Q2')
|
||||||
|
assert d['k2'] == 'Yes'
|
||||||
|
qs.do_prompt(d, 'k3', 'Q3')
|
||||||
|
assert d['k3'] == 'N'
|
||||||
|
qs.do_prompt(d, 'k4', 'Q4')
|
||||||
|
assert d['k4'] == 'N'
|
||||||
|
|
||||||
|
|
||||||
def test_do_prompt():
|
def test_do_prompt():
|
||||||
d = {}
|
d = {}
|
||||||
answers = {
|
answers = {
|
||||||
|
Loading…
Reference in New Issue
Block a user