diff options
Diffstat (limited to 'sphinx/apidoc.py')
| -rw-r--r-- | sphinx/apidoc.py | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py index 73bb963ce..1238693c8 100644 --- a/sphinx/apidoc.py +++ b/sphinx/apidoc.py @@ -20,6 +20,7 @@ import os import sys import optparse from os import path +from six import binary_type from sphinx.util.osutil import walk from sphinx import __display_version__ @@ -353,10 +354,10 @@ Note: By default this script will not overwrite already created files.""") path = opts.destdir, sep = False, dot = '_', - project = None, - author = 'Author', - version = '', - release = '', + project = opts.header, + author = opts.author or 'Author', + version = opts.version or '', + release = opts.release or opts.version or '', suffix = '.' + opts.suffix, master = 'index', epub = True, @@ -369,16 +370,14 @@ Note: By default this script will not overwrite already created files.""") mastertoctree = text, language = 'en', ) - if opts.header: - d['project'] = opts.header.decode('utf-8') - if opts.author: - d['author'] = opts.author.decode('utf-8') - if opts.version: - d['version'] = opts.version.decode('utf-8') - if opts.release: - d['release'] = opts.release.decode('utf-8') - elif opts.version: - d['release'] = opts.version.decode('utf-8') + if isinstance(opts.header, binary_type): + d['project'] = d['project'].decode('utf-8') + if isinstance(opts.author, binary_type): + d['author'] = d['author'].decode('utf-8') + if isinstance(opts.version, binary_type): + d['version'] = d['version'].decode('utf-8') + if isinstance(opts.release, binary_type): + d['release'] = d['release'].decode('utf-8') if not opts.dryrun: qs.generate(d, silent=True, overwrite=opts.force) |