From 13478a49867d358ef2c519cd5079ecd319d82628 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Mon, 26 Oct 2009 09:56:14 +0100 Subject: [PATCH] Make "make check" happy. --- doc/builders.rst | 2 +- sphinx/ext/autosummary/__init__.py | 2 +- sphinx/ext/autosummary/generate.py | 6 ++++-- sphinx/quickstart.py | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/builders.rst b/doc/builders.rst index 9b001105b..7891ce747 100644 --- a/doc/builders.rst +++ b/doc/builders.rst @@ -58,7 +58,7 @@ The builder's "name" must be given to the **-b** command-line option of .. class:: DevhelpBuilder This builder produces the same output as the standalone HTML builder, but - also generates `GNOME Devhelp `__ + also generates `GNOME Devhelp `__ support file that allows the GNOME Devhelp reader to view them. Its name is ``devhelp``. diff --git a/sphinx/ext/autosummary/__init__.py b/sphinx/ext/autosummary/__init__.py index dc641674f..3c9ff466b 100644 --- a/sphinx/ext/autosummary/__init__.py +++ b/sphinx/ext/autosummary/__init__.py @@ -226,7 +226,7 @@ class Autosummary(Directive): ``[(name, signature, summary_string, real_name), ...]``. """ env = self.state.document.settings.env - + prefixes = [''] if env.currmodule: prefixes.insert(0, env.currmodule) diff --git a/sphinx/ext/autosummary/generate.py b/sphinx/ext/autosummary/generate.py index f8447e949..8c0e10111 100644 --- a/sphinx/ext/autosummary/generate.py +++ b/sphinx/ext/autosummary/generate.py @@ -233,8 +233,10 @@ def find_autosummary_in_lines(lines, module=None, filename=None): corresponding options set. """ autosummary_re = re.compile(r'^\s*\.\.\s+autosummary::\s*') - automodule_re = re.compile(r'^\s*\.\.\s+automodule::\s*([A-Za-z0-9_.]+)\s*$') - module_re = re.compile(r'^\s*\.\.\s+(current)?module::\s*([a-zA-Z0-9_.]+)\s*$') + automodule_re = re.compile( + r'^\s*\.\.\s+automodule::\s*([A-Za-z0-9_.]+)\s*$') + module_re = re.compile( + r'^\s*\.\.\s+(current)?module::\s*([a-zA-Z0-9_.]+)\s*$') autosummary_item_re = re.compile(r'^\s+(~?[_a-zA-Z][a-zA-Z0-9_.]*)\s*.*?') toctree_arg_re = re.compile(r'^\s+:toctree:\s*(.*?)\s*$') template_arg_re = re.compile(r'^\s+:template:\s*(.*?)\s*$') diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py index 914d95672..7b11dfdd4 100644 --- a/sphinx/quickstart.py +++ b/sphinx/quickstart.py @@ -333,7 +333,8 @@ devhelp: \t@echo "Build finished." \t@echo "To view the help file:" \t@echo "# mkdir -p $$HOME/.local/share/devhelp/%(project_fn)s" -\t@echo "# ln -s %(rbuilddir)s/devhelp $$HOME/.local/share/devhelp/%(project_fn)s" +\t@echo "# ln -s %(rbuilddir)s/devhelp\ + $$HOME/.local/share/devhelp/%(project_fn)s" \t@echo "# devhelp" latex: