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

refactoring for quickstart

Browse Source
This commit is contained in:
shimizukawa 2015-03-14 14:39:15 +09:00
parent b7547bb7fe
commit 4c7a9b3973
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sphinx/quickstart.py
View File

@ -1419,20 +1419,23 @@ def valid_dir(d):
if not path.isdir(dir): if not path.isdir(dir):
return False return False
invalid_dirs = ['Makefile', 'make.bat'] if set(['Makefile', 'make.bat']) & set(os.listdir(dir)):
if set(invalid_dirs) & set(os.listdir(dir)):
return False return False
master = d['master']
suffix = d['suffix']
source = ['_static', '_templates', 'conf.py', master+suffix]
if d['sep']: if d['sep']:
dir = os.path.join('source', dir) dir = os.path.join('source', dir)
if not path.exists(dir): if not path.exists(dir):
return True return True
if not path.isdir(dir): if not path.isdir(dir):
return False return False
if set(source) & set(os.listdir(dir)):
reserved_names = [
'conf.py',
d['dot'] + 'static',
d['dot'] + 'templates',
d['master'] + d['suffix'],
]
if set(reserved_names) & set(os.listdir(dir)):
return False return False
return True return True
@ -1521,21 +1524,17 @@ def main(argv=sys.argv):
opts.ensure_value('path', args[0]) opts.ensure_value('path', args[0])
d = vars(opts) d = vars(opts)
for k, v in list(d.items()): # delete None or False value
# delete None or False value d = dict((k, v) for k, v in d.items() if not (v is None or v is False))
if v is None or v is False:
del d[k]
try: try:
if 'quiet' in d: if 'quiet' in d:
if 'project' not in d or 'author' not in d or \ if not set(['project', 'author', 'version']).issubset(d):
'version' not in d:
print('''"quiet" is specified, but any of "project", \ print('''"quiet" is specified, but any of "project", \
"author" or "version" is not specified.''') "author" or "version" is not specified.''')
return return
if all(['quiet' in d, 'project' in d, 'author' in d, if set(['quiet', 'project', 'author', 'version']).issubset(d):
'version' in d]):
# quiet mode with all required params satisfied, use default # quiet mode with all required params satisfied, use default
d.setdefault('release', d['version']) d.setdefault('release', d['version'])
d2 = DEFAULT_VALUE.copy() d2 = DEFAULT_VALUE.copy()