From: <md...@us...> - 2011-01-14 18:16:48
|
Revision: 8918 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8918&view=rev Author: mdboom Date: 2011-01-14 18:16:42 +0000 (Fri, 14 Jan 2011) Log Message: ----------- Merged revisions 8917 via svnmerge from https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint ........ r8917 | mdboom | 2011-01-14 13:15:33 -0500 (Fri, 14 Jan 2011) | 2 lines Fix doc build with recent versions of Sphinx (reported by Sandro Tosi) ........ 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_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8913 /trunk/matplotlib:1-7315 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8917 /trunk/matplotlib:1-7315 Modified: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py =================================================================== --- trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py 2011-01-14 18:15:33 UTC (rev 8917) +++ trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py 2011-01-14 18:16:42 UTC (rev 8918) @@ -346,7 +346,7 @@ del options['nofigs'] formats = setup.config.plot_formats - if type(formats) == str: + if isinstance(formats, basestring): formats = eval(formats) fname = os.path.basename(plot_path) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |