summaryrefslogtreecommitdiff
path: root/doc/sphinxext/plot_directive.py
diff options
context:
space:
mode:
authorpierregm <pierregmcode@gmail.com>2010-10-11 23:02:10 +0200
committerpierregm <pierregmcode@gmail.com>2010-10-11 23:02:10 +0200
commita14dd542532d383610c1b01c5698b137dd058fea (patch)
tree036f0452ee16fe1b9b74c13e6ad9bb9155310256 /doc/sphinxext/plot_directive.py
parent61d945bdb5c9b2b3329e1b8468b5c7d0596dd9fc (diff)
parent11ee694744f2552d77652ed929fdc2b4ccca6843 (diff)
downloadnumpy-a14dd542532d383610c1b01c5698b137dd058fea.tar.gz
merging refs/remotes/origin/master into HEAD
Diffstat (limited to 'doc/sphinxext/plot_directive.py')
-rw-r--r--doc/sphinxext/plot_directive.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/doc/sphinxext/plot_directive.py b/doc/sphinxext/plot_directive.py
index efbd0d303..80801e798 100644
--- a/doc/sphinxext/plot_directive.py
+++ b/doc/sphinxext/plot_directive.py
@@ -317,12 +317,8 @@ def run(arguments, content, options, state_machine, state, lineno):
opts = [':%s: %s' % (key, val) for key, val in options.items()
if key in ('alt', 'height', 'width', 'scale', 'align', 'class')]
- if sphinx.__version__ >= "0.6":
- only_html = ".. only:: html"
- only_latex = ".. only:: latex"
- else:
- only_html = ".. htmlonly::"
- only_latex = ".. latexonly::"
+ only_html = ".. only:: html"
+ only_latex = ".. only:: latex"
if j == 0:
src_link = source_link