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

Make quickstart just exit without reprompting

Browse Source
This commit is contained in:
Raymond Sun 2021-06-12 00:07:34 +10:00
parent 025db04658
commit 81049deed6
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sphinx/cmd/quickstart.py
View File

@ -220,11 +220,8 @@ def ask_user(d: Dict) -> None:
print() print()
print(bold(__('Error: an existing conf.py has been found in the ' print(bold(__('Error: an existing conf.py has been found in the '
'selected root path.'))) 'selected root path.')))
print(__('sphinx-quickstart will not overwrite existing Sphinx projects.')) print(__('sphinx-quickstart will not overwrite existing Sphinx projects. Try another directory?'))
print() print()
d['path'] = do_prompt(__('Please enter a new root path (or just Enter to exit)'),
'', ok)
if not d['path']:
sys.exit(1) sys.exit(1)
if 'sep' not in d: if 'sep' not in d:

7
tests/test_quickstart.py
View File

@ -251,16 +251,13 @@ def test_extensions(tempdir):
exec(conffile.read_text(), ns) exec(conffile.read_text(), ns)
assert ns['extensions'] == ['foo', 'bar', 'baz'] assert ns['extensions'] == ['foo', 'bar', 'baz']
def test_easy_exit_when_existing_confpy(monkeypatch): def test_exits_upon_existing_confpy(monkeypatch):
# The code detects existing conf.py with isfile() so we mock it # The code detects existing conf.py with isfile() so we mock it
def mock_isfile(path): def mock_isfile(path):
return True return True
monkeypatch.setattr(path, 'isfile', mock_isfile) monkeypatch.setattr(path, 'isfile', mock_isfile)
answers = { qs.term_input = mock_input({})
'Please enter a new root path': '',
}
qs.term_input = mock_input(answers)
d = {} d = {}
with pytest.raises(SystemExit): with pytest.raises(SystemExit):
qs.ask_user(d) qs.ask_user(d)