fix validation of ps.papersize : auto

ddale · ddale · commit 7a28d0f471fe · 2006-03-12T00:16:41.000Z
svn path=/trunk/matplotlib/; revision=2140
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -592,7 +592,7 @@ def validate_verbose_fileo(s):
 
 
 validate_ps_papersize = ValidateInStrings([
-        'executive', 'letter', 'legal', 'ledger',
+        'auto', 'letter', 'legal', 'ledger',
         'a0', 'a1', 'a2','a3', 'a4', 'a5', 'a6', 'a7', 'a8', 'a9', 'a10',
         'b0', 'b1', 'b2', 'b3', 'b4', 'b5', 'b6', 'b7', 'b8', 'b9', 'b10',
         ], ignorecase=True)
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -969,7 +969,8 @@ def print_figure(self, outfile, dpi=72, facecolor='w', edgecolor='w',
         """
         if not papertype: papertype = rcParams['ps.papersize']
         papertype = papertype.lower()
-        if not papersize.has_key(papertype):
+        if papertype == 'auto': pass
+        elif not papersize.has_key(papertype):
             raise RuntimeError( '%s is not a valid papertype. Use one \
                     of %s'% (papertype, ', '.join( papersize.keys() )) )
         
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -216,7 +216,7 @@ tk.window_focus   : False    # Maintain shell focus for TkAgg
 tk.pythoninspect  : False    # tk sets PYTHONINSEPCT
 
 # ps backend params
-ps.papersize      : letter   # executive, letter, legal, ledger, A0-A10, B0-B10
+ps.papersize      : letter   # auto, letter, legal, ledger, A0-A10, B0-B10
 ps.useafm         : False    # use of afm fonts, results in small files
 ps.usedistiller   : False    # can be: None, ghostscript or xpdf
                                           # Experimental: may produce smaller files.
