SF.net SVN: matplotlib:[7894] trunk/matplotlib

[<lee...@us...>]

Revision: 7894
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7894&view=rev
Author:   leejjoon
Date:     2009-10-19 09:04:42 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
Merged revisions 7893 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint

........
  r7893 | leejjoon | 2009-10-19 05:02:08 -0400 (Mon, 19 Oct 2009) | 1 line
  
  fix a bug in plot_directive
........

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/mathtex:1-7263 /branches/v0_99_maint:1-7887
   + /branches/mathtex:1-7263 /branches/v0_99_maint:1-7893

Modified: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py	2009-10-19 09:02:08 UTC (rev 7893)
+++ trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py	2009-10-19 09:04:42 UTC (rev 7894)
@@ -113,7 +113,10 @@
             i+=1
 
         rel_list = [os.pardir] * (len(base_list)-i) + target_list[i:]
-        return os.path.join(*rel_list)
+        if rel_list:
+            return os.path.join(*rel_list)
+        else:
+            return ""
 
 template = """
 .. htmlonly::
@@ -294,7 +297,7 @@
     outdir = os.path.join('plot_directive', basedir)
     reldir = relpath(setup.confdir, rstdir)
     linkdir = os.path.join(reldir, outdir)
-    
+
     # tmpdir is where we build all the output files.  This way the
     # plots won't have to be redone when generating latex after html.
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.