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

Rename arguments and make a few more optional, for convenience.

Browse Source
This commit is contained in:
Georg Brandl 2010-02-21 15:36:26 +01:00
parent 7b86a2f3c2
commit a497d65658
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sphinx/application.py
View File

@ -61,8 +61,8 @@ ENV_PICKLE_FILENAME = 'environment.pickle'
class Sphinx(object):
def __init__(self, srcdir, confdir, outdir, doctreedir, buildername,
confoverrides, status, warning=sys.stderr, freshenv=False,
warningiserror=False, tags=None):
confoverrides=None, status=sys.stdout, warning=sys.stderr,
freshenv=False, warningiserror=False, tags=None):
self.next_listener_id = 0
self._extensions = {}
self._listeners = {}
@ -100,7 +100,8 @@ class Sphinx(object):
# read config
self.tags = Tags(tags)
self.config = Config(confdir, CONFIG_FILENAME, confoverrides, self.tags)
self.config = Config(confdir, CONFIG_FILENAME,
confoverrides or {}, self.tags)
self.config.check_unicode(self.warn)
# load all extension modules
@ -189,9 +190,9 @@ class Sphinx(object):
self.builder = builderclass(self)
self.emit('builder-inited')
def build(self, all_files, filenames):
def build(self, force_all=False, filenames=None):
try:
if all_files:
if force_all:
self.builder.build_all()
elif filenames:
self.builder.build_specific(filenames)

8
sphinx/cmdline.py
View File

@ -89,8 +89,8 @@ def main(argv):
if err:
return 1
buildername = all_files = None
freshenv = warningiserror = use_pdb = False
buildername = None
force_all = freshenv = warningiserror = use_pdb = False
status = sys.stdout
warning = sys.stderr
error = sys.stderr
@ -105,7 +105,7 @@ def main(argv):
if filenames:
usage(argv, 'Cannot combine -a option and filenames.')
return 1
all_files = True
force_all = True
elif opt == '-t':
tags.append(val)
elif opt == '-d':
@ -167,7 +167,7 @@ def main(argv):
app = Sphinx(srcdir, confdir, outdir, doctreedir, buildername,
confoverrides, status, warning, freshenv,
warningiserror, tags)
app.build(all_files, filenames)
app.build(force_all, filenames)
return app.statuscode
except KeyboardInterrupt:
if use_pdb: