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

[<jd...@us...>]

Revision: 6286
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6286&view=rev
Author:   jdh2358
Date:     2008-10-21 14:36:53 +0000 (Tue, 21 Oct 2008)

Log Message:
-----------
fixed rcsetup to respect external module backends

Modified Paths:
--------------
    trunk/matplotlib/examples/misc/image_thumbnail.py
    trunk/matplotlib/lib/matplotlib/image.py
    trunk/matplotlib/lib/matplotlib/rcsetup.py

Modified: trunk/matplotlib/examples/misc/image_thumbnail.py
===================================================================
--- trunk/matplotlib/examples/misc/image_thumbnail.py	2008-10-20 20:54:24 UTC (rev 6285)
+++ trunk/matplotlib/examples/misc/image_thumbnail.py	2008-10-21 14:36:53 UTC (rev 6286)
@@ -13,7 +13,7 @@
     print 'Usage: python %s IMAGEDIR'%__file__
     raise SystemExit
 indir = sys.argv[1]
-if not os.path.exists(indir):
+if not os.path.isdir(indir):
     print 'Could not find input directory "%s"'%indir
     raise SystemExit
 

Modified: trunk/matplotlib/lib/matplotlib/image.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/image.py	2008-10-20 20:54:24 UTC (rev 6285)
+++ trunk/matplotlib/lib/matplotlib/image.py	2008-10-21 14:36:53 UTC (rev 6286)
@@ -846,22 +846,17 @@
     else:
         if extension=='png':
             from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
-            from matplotlib.figure import Figure
         elif extension=='pdf':
             from matplotlib.backends.backend_pdf import FigureCanvasPDF as FigureCanvas
-            from matplotlib.figure import Figure
         elif extension=='svg':
             from matplotlib.backends.backend_svg import FigureCanvasSVG as FigureCanvas
-            from matplotlib.figure import Figure
         else:
             raise ValueError("Can only handle extension 'png', 'svg' or 'pdf'")
 
+        from matplotlib.figure import Figure
         fig = Figure(figsize=(width, height), dpi=dpi)
         canvas = FigureCanvas(fig)
 
-
-
-
     ax = fig.add_axes([0,0,1,1], aspect='auto', frameon=False, xticks=[], yticks=[])
 
     basename, ext = os.path.splitext(basename)

Modified: trunk/matplotlib/lib/matplotlib/rcsetup.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/rcsetup.py	2008-10-20 20:54:24 UTC (rev 6285)
+++ trunk/matplotlib/lib/matplotlib/rcsetup.py	2008-10-21 14:36:53 UTC (rev 6286)
@@ -100,7 +100,11 @@
             raise ValueError('Supported Postscript/PDF font types are %s' % fonttypes.values())
         return fonttype
 
-validate_backend = ValidateInStrings('backend', all_backends, ignorecase=True)
+#validate_backend = ValidateInStrings('backend', all_backends, ignorecase=True)
+_validate_standard_backends = ValidateInStrings('backend', all_backends, ignorecase=True)
+def validate_backend(s):
+    if s.startswith('module://'): return s
+    else: return _validate_standard_backends(s)
 
 validate_numerix = ValidateInStrings('numerix',[
     'Numeric','numarray','numpy',


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