From a497d65658f188b78e2ee51e50b69add9c710286 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 21 Feb 2010 15:36:26 +0100
Subject: [PATCH] Rename arguments and make a few more optional, for
 convenience.

---
 sphinx/application.py | 11 ++++++-----
 sphinx/cmdline.py     |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/sphinx/application.py b/sphinx/application.py
index ba2940fa2..cd9baf9c0 100644
--- a/sphinx/application.py
+++ b/sphinx/application.py
@@ -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)
diff --git a/sphinx/cmdline.py b/sphinx/cmdline.py
index dc3269e23..bc5aff877 100644
--- a/sphinx/cmdline.py
+++ b/sphinx/cmdline.py
@@ -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: