diff options
author | Robert Lehmann <mail@robertlehmann.de> | 2013-01-06 12:14:57 +0100 |
---|---|---|
committer | Robert Lehmann <mail@robertlehmann.de> | 2013-01-06 12:14:57 +0100 |
commit | e465e22d435817870a5e6ca786c00249d11c414a (patch) | |
tree | bf4e659063cc2aa7bcc29d072c0ec364a9067b2c /sphinx/directives | |
parent | 42a4e769aa046304b67c64f25ce5914b00b01bf0 (diff) | |
parent | ee79a8698848e1f8eb4a344cc5b00b1d17bac44a (diff) | |
download | sphinx-e465e22d435817870a5e6ca786c00249d11c414a.tar.gz |
merge birkenfeld/sphinx
Diffstat (limited to 'sphinx/directives')
-rw-r--r-- | sphinx/directives/other.py | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/sphinx/directives/other.py b/sphinx/directives/other.py index c6baf775..3167d606 100644 --- a/sphinx/directives/other.py +++ b/sphinx/directives/other.py @@ -11,6 +11,7 @@ import os from docutils import nodes from docutils.parsers.rst import Directive, directives +from docutils.parsers.rst.directives.admonitions import BaseAdmonition from docutils.parsers.rst.directives.misc import Class from docutils.parsers.rst.directives.misc import Include as BaseInclude @@ -205,29 +206,11 @@ class VersionChange(Directive): return ret -class SeeAlso(Directive): +class SeeAlso(BaseAdmonition): """ An admonition mentioning things to look at as reference. """ - has_content = True - required_arguments = 0 - optional_arguments = 1 - final_argument_whitespace = True - option_spec = {} - - def run(self): - ret = make_admonition( - addnodes.seealso, self.name, [_('See also')], self.options, - self.content, self.lineno, self.content_offset, self.block_text, - self.state, self.state_machine) - if self.arguments: - argnodes, msgs = self.state.inline_text(self.arguments[0], - self.lineno) - para = nodes.paragraph() - para += argnodes - para += msgs - ret[0].insert(1, para) - return ret + node_class = addnodes.seealso class TabularColumns(Directive): |