diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2017-01-01 23:03:57 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2017-01-05 13:52:17 +0900 |
| commit | 099daa602b003f5e5f6a00d34f55e632f772086d (patch) | |
| tree | a35ffeebdc4374941d3c6efa4ebceb42af90f329 /sphinx/ext/graphviz.py | |
| parent | 431d865d4aff6ed556f07c628b181422d8e9c4fc (diff) | |
| download | sphinx-git-099daa602b003f5e5f6a00d34f55e632f772086d.tar.gz | |
Drop deprecated options for graphviz extension
Diffstat (limited to 'sphinx/ext/graphviz.py')
| -rw-r--r-- | sphinx/ext/graphviz.py | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py index 19da59cf7..7df115ea0 100644 --- a/sphinx/ext/graphviz.py +++ b/sphinx/ext/graphviz.py @@ -82,7 +82,6 @@ class Graphviz(Directive): option_spec = { 'alt': directives.unchanged, 'align': align_spec, - 'inline': directives.flag, 'caption': directives.unchanged, 'graphviz_dot': directives.unchanged, 'name': directives.unchanged, @@ -122,8 +121,6 @@ class Graphviz(Directive): node['alt'] = self.options['alt'] if 'align' in self.options: node['align'] = self.options['align'] - if 'inline' in self.options: - node['inline'] = True caption = self.options.get('caption') if caption: @@ -144,7 +141,6 @@ class GraphvizSimple(Directive): option_spec = { 'alt': directives.unchanged, 'align': align_spec, - 'inline': directives.flag, 'caption': directives.unchanged, 'graphviz_dot': directives.unchanged, 'name': directives.unchanged, @@ -162,8 +158,6 @@ class GraphvizSimple(Directive): node['alt'] = self.options['alt'] if 'align' in self.options: node['align'] = self.options['align'] - if 'inline' in self.options: - node['inline'] = True caption = self.options.get('caption') if caption: @@ -233,16 +227,6 @@ def render_dot(self, code, options, format, prefix='graphviz'): return relfn, outfn -def warn_for_deprecated_option(self, node): - # type: (nodes.NodeVisitor, graphviz) -> None - if hasattr(self.builder, '_graphviz_warned_inline'): - return - - if 'inline' in node: - logger.warning(':inline: option for graphviz is deprecated since version 1.4.0.') - self.builder._graphviz_warned_inline = True - - def render_dot_html(self, node, code, options, prefix='graphviz', imgcls=None, alt=None): # type: (nodes.NodeVisitor, graphviz, unicode, Dict, unicode, unicode, unicode) -> Tuple[unicode, unicode] # NOQA @@ -290,7 +274,6 @@ def render_dot_html(self, node, code, options, prefix='graphviz', def html_visit_graphviz(self, node): # type: (nodes.NodeVisitor, graphviz) -> None - warn_for_deprecated_option(self, node) render_dot_html(self, node, node['code'], node['options']) @@ -327,7 +310,6 @@ def render_dot_latex(self, node, code, options, prefix='graphviz'): def latex_visit_graphviz(self, node): # type: (nodes.NodeVisitor, graphviz) -> None - warn_for_deprecated_option(self, node) render_dot_latex(self, node, node['code'], node['options']) @@ -345,13 +327,11 @@ def render_dot_texinfo(self, node, code, options, prefix='graphviz'): def texinfo_visit_graphviz(self, node): # type: (nodes.NodeVisitor, graphviz) -> None - warn_for_deprecated_option(self, node) render_dot_texinfo(self, node, node['code'], node['options']) def text_visit_graphviz(self, node): # type: (nodes.NodeVisitor, graphviz) -> None - warn_for_deprecated_option(self, node) if 'alt' in node.attributes: self.add_text(_('[graph: %s]') % node['alt']) else: @@ -361,7 +341,6 @@ def text_visit_graphviz(self, node): def man_visit_graphviz(self, node): # type: (nodes.NodeVisitor, graphviz) -> None - warn_for_deprecated_option(self, node) if 'alt' in node.attributes: self.body.append(_('[graph: %s]') % node['alt']) else: |