From: <jd...@us...> - 2009-03-27 18:11:35
|
Revision: 7006 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7006&view=rev Author: jdh2358 Date: 2009-03-27 18:11:18 +0000 (Fri, 27 Mar 2009) Log Message: ----------- applied Gael's sphinx patch Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py Modified: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py =================================================================== --- trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py 2009-03-25 19:27:28 UTC (rev 7005) +++ trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py 2009-03-27 18:11:18 UTC (rev 7006) @@ -17,6 +17,7 @@ """ import sys, os, glob, shutil, hashlib, imp, warnings, cStringIO +import re try: from hashlib import md5 except ImportError: @@ -33,7 +34,10 @@ import sphinx sphinx_version = sphinx.__version__.split(".") -sphinx_version = tuple([int(x) for x in sphinx_version[:2]]) +# The split is necessary for sphinx beta versions where the string is +# '6b1' +sphinx_version = tuple([int(re.split('[a-z]', x)[0]) + for x in sphinx_version[:2]]) import matplotlib import matplotlib.cbook as cbook This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |