diff options
Diffstat (limited to 'sphinx')
| -rw-r--r-- | sphinx/apidoc.py | 10 | ||||
| -rw-r--r-- | sphinx/builders/gettext.py | 3 | ||||
| -rw-r--r-- | sphinx/domains/cpp.py | 3 | ||||
| -rw-r--r-- | sphinx/domains/python.py | 11 | ||||
| -rw-r--r-- | sphinx/quickstart.py | 4 |
5 files changed, 18 insertions, 13 deletions
diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py index 24c56fbf..7e7f341f 100644 --- a/sphinx/apidoc.py +++ b/sphinx/apidoc.py @@ -8,9 +8,9 @@ creates a modules index (named modules.<suffix>). This is derived from the "sphinx-autopackage" script, which is: - Copyright 2008 Société des arts technologiques (SAT), http://www.sat.qc.ca/. + Copyright 2008 Société des arts technologiques (SAT), http://www.sat.qc.ca/ - :copyright: 2007-2011 by the Sphinx team, see AUTHORS. + :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. """ import os @@ -172,7 +172,8 @@ def recurse_tree(rootpath, excludes, opts): if is_pkg: # we are in a package with something to document - if subs or len(py_files) > 1 or not shall_skip(path.join(root, INITPY)): + if subs or len(py_files) > 1 or not \ + shall_skip(path.join(root, INITPY)): subpackage = root[len(rootpath):].lstrip(path.sep).\ replace(path.sep, '.') create_package_file(root, root_package, subpackage, @@ -251,7 +252,8 @@ Note: By default this script will not overwrite already created files.""") help='Generate a full project with sphinx-quickstart') parser.add_option('-H', '--doc-project', action='store', dest='header', help='Project name (default: root module name)') - parser.add_option('-A', '--doc-author', action='store', dest='author', type='str', + parser.add_option('-A', '--doc-author', action='store', dest='author', + type='str', help='Project author(s), used when --full is given') parser.add_option('-V', '--doc-version', action='store', dest='version', help='Project version, used when --full is given') diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py index 80df09a5..a5f71a5f 100644 --- a/sphinx/builders/gettext.py +++ b/sphinx/builders/gettext.py @@ -100,7 +100,8 @@ class MessageCatalogBuilder(I18nBuilder): ) for textdomain, catalog in self.status_iterator( self.catalogs.iteritems(), "writing message catalogs... ", - lambda (textdomain, _):darkgreen(textdomain), len(self.catalogs)): + lambda (textdomain, _): darkgreen(textdomain), + len(self.catalogs)): # noop if config.gettext_compact is set ensuredir(path.join(self.outdir, path.dirname(textdomain))) diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py index 46bb7353..acb8ba09 100644 --- a/sphinx/domains/cpp.py +++ b/sphinx/domains/cpp.py @@ -1028,7 +1028,8 @@ class CPPClassObject(CPPObject): signode += nodes.Text(' : ') for base in cls.bases: self.attach_modifiers(signode, base, 'private') - signode += nodes.emphasis(unicode(base.name), unicode(base.name)) + signode += nodes.emphasis(unicode(base.name), + unicode(base.name)) signode += nodes.Text(', ') signode.pop() # remove the trailing comma diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py index 98d93545..779b071a 100644 --- a/sphinx/domains/python.py +++ b/sphinx/domains/python.py @@ -422,13 +422,14 @@ class PyModule(Directive): env.domaindata['py']['modules'][modname] = \ (env.docname, self.options.get('synopsis', ''), self.options.get('platform', ''), 'deprecated' in self.options) - # make a duplicate entry in 'objects' to facilitate searching for the - # module in PythonDomain.find_obj() + # make a duplicate entry in 'objects' to facilitate searching for + # the module in PythonDomain.find_obj() env.domaindata['py']['objects'][modname] = (env.docname, 'module') - targetnode = nodes.target('', '', ids=['module-' + modname], ismod=True) + targetnode = nodes.target('', '', ids=['module-' + modname], + ismod=True) self.state.document.note_explicit_target(targetnode) - # the platform and synopsis aren't printed; in fact, they are only used - # in the modindex currently + # the platform and synopsis aren't printed; in fact, they are only + # used in the modindex currently ret.append(targetnode) indextext = _('%s (module)') % modname inode = addnodes.index(entries=[('single', indextext, diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py index ecb46040..88be5cee 100644 --- a/sphinx/quickstart.py +++ b/sphinx/quickstart.py @@ -934,8 +934,8 @@ pngmath has been deselected.''' do_prompt(d, 'ext_ifconfig', 'ifconfig: conditional inclusion of ' 'content based on config values (y/N)', 'n', boolean) if 'ext_viewcode' not in d: - do_prompt(d, 'ext_viewcode', 'viewcode: include links to the source code ' - 'of documented Python objects (y/N)', 'n', boolean) + do_prompt(d, 'ext_viewcode', 'viewcode: include links to the source ' + 'code of documented Python objects (y/N)', 'n', boolean) if 'makefile' not in d: print ''' |