diff options
| author | Georg Brandl <georg@python.org> | 2014-09-22 21:28:30 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-09-22 21:28:30 +0200 |
| commit | 052b2ba1233c08d77b65b21635336378e5259ebf (patch) | |
| tree | 9cae015d3c4b4de0a09f7635f6689f1e9829a2b1 | |
| parent | ed421230345e6f2ac295fb84867f33cccd79cf11 (diff) | |
| download | sphinx-052b2ba1233c08d77b65b21635336378e5259ebf.tar.gz | |
Fix default for verbosity option (crashes on Py3).
| -rw-r--r-- | sphinx/builders/__init__.py | 3 | ||||
| -rw-r--r-- | sphinx/cmdline.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sphinx/builders/__init__.py b/sphinx/builders/__init__.py index 2ae7ba49..a8ca2bc8 100644 --- a/sphinx/builders/__init__.py +++ b/sphinx/builders/__init__.py @@ -237,8 +237,7 @@ class Builder(object): First updates the environment, and then calls :meth:`write`. """ if summary: - self.info(bold('building [%s]: ' % self.name), nonl=1) - self.info(summary) + self.info(bold('building [%s]' % self.name) + ': ' + summary) updated_docnames = set() # while reading, collect all warnings from docutils diff --git a/sphinx/cmdline.py b/sphinx/cmdline.py index 46ab6720..18a17ab3 100644 --- a/sphinx/cmdline.py +++ b/sphinx/cmdline.py @@ -107,7 +107,7 @@ def main(argv): help='nit-picky mode, warn about all missing references') group = parser.add_option_group('Console output options') - group.add_option('-v', action='count', dest='verbosity', + group.add_option('-v', action='count', dest='verbosity', default=0, help='increase verbosity (can be repeated)') group.add_option('-q', action='store_true', dest='quiet', help='no output on stdout, just warnings on stderr') |