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

Fix flake8 errors

Browse Source
This commit is contained in:
Raymond Sun 2021-06-14 15:57:50 +10:00
parent c9aefa4a26
commit 6a9cc9e5ea
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sphinx/cmd/quickstart.py
View File

@ -95,6 +95,12 @@ def is_path(x: str) -> str:
return x return x
def is_path_or_empty(x: str) -> str:
if x == '':
return x
return is_path(x)
def allow_empty(x: str) -> str: def allow_empty(x: str) -> str:
return x return x
@ -222,7 +228,10 @@ def ask_user(d: Dict) -> None:
'selected root path.'))) 'selected root path.')))
print(__('sphinx-quickstart will not overwrite existing Sphinx projects.')) print(__('sphinx-quickstart will not overwrite existing Sphinx projects.'))
print() print()
sys.exit(1) d['path'] = do_prompt(__('Please enter a new root path (or just Enter to exit)'),
'', is_path_or_empty)
if not d['path']:
sys.exit(1)
if 'sep' not in d: if 'sep' not in d:
print() print()

4
tests/test_quickstart.py
View File

@ -123,6 +123,7 @@ def test_quickstart_defaults(tempdir):
assert (tempdir / 'Makefile').isfile() assert (tempdir / 'Makefile').isfile()
assert (tempdir / 'make.bat').isfile() assert (tempdir / 'make.bat').isfile()
def test_quickstart_all_answers(tempdir): def test_quickstart_all_answers(tempdir):
answers = { answers = {
'Root path': tempdir, 'Root path': tempdir,
@ -251,12 +252,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_exits_upon_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)
qs.term_input = mock_input({}) qs.term_input = mock_input({})
d = {} d = {}
with pytest.raises(SystemExit): with pytest.raises(SystemExit):