diff --git a/sphinx/cmd/quickstart.py b/sphinx/cmd/quickstart.py index 29f1c50a6..1b2eacc95 100644 --- a/sphinx/cmd/quickstart.py +++ b/sphinx/cmd/quickstart.py @@ -220,12 +220,9 @@ def ask_user(d: Dict) -> None: print() print(bold(__('Error: an existing conf.py has been found in the ' '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() - 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: print() diff --git a/tests/test_quickstart.py b/tests/test_quickstart.py index 96b11daec..4ee5535cb 100644 --- a/tests/test_quickstart.py +++ b/tests/test_quickstart.py @@ -251,16 +251,13 @@ def test_extensions(tempdir): exec(conffile.read_text(), ns) 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 def mock_isfile(path): return True monkeypatch.setattr(path, 'isfile', mock_isfile) - answers = { - 'Please enter a new root path': '', - } - qs.term_input = mock_input(answers) + qs.term_input = mock_input({}) d = {} with pytest.raises(SystemExit): - qs.ask_user(d) \ No newline at end of file + qs.ask_user(d)