Merged revisions 6950 via svnmerge from

mdboom · mdboom · commit 261b6f879512 · 2009-03-03T22:08:38.000Z
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint ........ r6950 | mdboom | 2009-03-03 17:06:53 -0500 (Tue, 03 Mar 2009) | 2 lines Add workaround for change in handling of absolute paths in image directive in recent Sphinx hg versions. ........ svn path=/trunk/matplotlib/; revision=6951
diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py
@@ -30,6 +30,10 @@
     from docutils.parsers.rst.directives.images import Image
     align = Image.align
 from docutils import nodes
+import sphinx
+
+sphinx_version = sphinx.__version__.split(".")
+sphinx_version = tuple([int(x) for x in sphinx_version[:2]])
 
 import matplotlib
 import matplotlib.cbook as cbook
@@ -92,11 +96,11 @@ def write_char(s):
 
    [%(links)s]
 
-   .. image:: %(tmpdir)s/%(outname)s.png
+   .. image:: %(prefix)s%(tmpdir)s/%(outname)s.png
    %(options)s
 
 .. latexonly::
-   .. image:: %(tmpdir)s/%(outname)s.pdf
+   .. image:: %(prefix)s%(tmpdir)s/%(outname)s.pdf
    %(options)s
 """
 
@@ -262,7 +266,17 @@ def plot_directive(name, arguments, options, content, lineno,
 
     # tmpdir is where we build all the output files.  This way the
     # plots won't have to be redone when generating latex after html.
-    tmpdir = os.path.abspath(os.path.join('build', outdir))
+
+    # Prior to Sphinx 0.6, absolute image paths were treated as
+    # relative to the root of the filesystem.  0.6 and after, they are
+    # treated as relative to the root of the documentation tree.  We need
+    # to support both methods here.
+    tmpdir = os.path.join('build', outdir)
+    if sphinx_version < (0, 6):
+        tmpdir = os.path.abspath(tmpdir)
+        prefix = ''
+    else:
+        prefix = '/'
     if not os.path.exists(tmpdir):
         cbook.mkdirs(tmpdir)
 
