2.2 fixes

svn path=/trunk/matplotlib/; revision=709

Author: jdh2358

examples/backend_driver.py

@@ -47,24 +47,37 @@
     'multiple_figs_demo.py',
     'pcolor_demo.py',
     'pcolor_demo2.py',
-    'pcolor_small.py',    
+    'pcolor_small.py',
+    'polar_demo.py',
+    'polar_scatter.py',
     'psd_demo.py',
     'scatter_demo.py',
     'scatter_demo2.py',
     'simple_plot.py',
     'specgram_demo.py',
     'stock_demo.py',
     'subplot_demo.py',
+#    'set_and_get.py',    
     'table_demo.py',
     'text_handles.py',
     'text_themes.py',
     'two_scales.py',
     'vline_demo.py',
     )
 
-def drive(backend):
 
+#tests known to fail on python22 (require datetime)
+fail22  = (
+    'date_demo1.py',
+    'date_demo2.py',    
+    'finance_demo.py',
+    )
+def drive(backend, python='python2.3'):
+    
     for fname in files:
+        if python=='python2.2' and fname in fail22:
+            print '\tSkipping %s, known to fail on python2.2'%fname
+            continue
         lines = [
             'from __future__ import division\n',
             'import matplotlib\n',
@@ -84,18 +97,19 @@ def drive(backend):
             lines.append('savefig("%s", dpi=150)' % outfile)
         tmpfile = '_tmp_%s.py' % basename
         file(tmpfile, 'w').write(''.join(lines))
-        os.system('python %s' % tmpfile)
+        os.system('%s %s' % (python, tmpfile))
 
 times = {}
 backends = ['PS', 'GD', 'Paint', 'Agg', 'Template']
 #backends.extend([ 'GTK', 'WX', 'TkAgg'])
 #backends = [ 'Agg']
 backends = [ 'SVG', 'PS', 'Agg', 'Template']
 
+python = 'python2.3'
 for backend in backends:
     print 'testing %s' % backend
     t0 = time.time()
-    drive(backend)
+    drive(backend, python)
     t1 = time.time()
     times[backend] = (t1-t0)/60.0
 

examples/set_and_get.py

@@ -92,3 +92,5 @@
 set(t)
 print 'Text getters'
 get(t)
+
+show()

lib/matplotlib/axes.py

@@ -9,7 +9,7 @@
 from artist import Artist
 from axis import XAxis, YAxis
 from cbook import iterable, is_string_like, flatten, enumerate, True, False,\
-     allequal
+     allequal, dict_delall
 from collections import RegularPolyCollection, PolyCollection
 from colors import colorConverter, normalize, Colormap, LinearSegmentedColormap
 import cm
@@ -281,8 +281,6 @@ def _grab_next_args(self, *args, **kwargs):
 
 
 
-
-        
 class Axes(Artist):
     """
     Emulate matlab's axes command, creating axes with
@@ -1457,13 +1455,13 @@ def legend(self, *args, **kwargs):
         if len(args)==0:
             labels = [line.get_label() for line in self.lines]
             lines = self.lines
-            loc = kwargs.pop('loc', 1)
+            loc = kwargs.gry('loc', 1)
 
         elif len(args)==1:
             # LABELS
             labels = args[0]
             lines = [line for line, label in zip(self.lines, labels)]
-            loc = kwargs.pop('loc', 1)
+            loc = kwargs.get('loc', 1)
 
         elif len(args)==2:
             if is_string_like(args[1]) or isinstance(args[1], int):
@@ -1473,7 +1471,7 @@ def legend(self, *args, **kwargs):
             else:
                 # LINES, LABELS
                 lines, labels = args
-                loc = kwargs.pop('loc', 1)
+                loc = kwargs.get('loc', 1)
 
         elif len(args)==3:
             # LINES, LABELS, LOC
@@ -1506,15 +1504,18 @@ def loglog(self, *args, **kwargs):
   * subsy: the location of the minor yticks; None defaults to range(2,basey)    
         """
         if not self._hold: self.cla()
-        dx = {'basex': kwargs.pop('basex', 10),
-              'subsx': kwargs.pop('subsx', None),
+
+        dx = {'basex': kwargs.get('basex', 10),
+              'subsx': kwargs.get('subsx', None),
               }
-        dy = {'basey': kwargs.pop('basey', 10),
-              'subsy': kwargs.pop('subsy', None),
+        dy = {'basey': kwargs.get('basey', 10),
+              'subsy': kwargs.get('subsy', None),
               }
 
         self.set_xscale('log', **dx)
         self.set_yscale('log', **dy)
+        dict_delall( kwargs, ('basex', 'basey', 'subsx', 'subsy')) 
+
         l = self.plot(*args, **kwargs)
         return l
 
@@ -1596,14 +1597,12 @@ def pcolor(self, *args, **kwargs):
         """
         if not self._hold: self.cla()
 
-        alpha = kwargs.pop('alpha', 1.0)
-        norm = kwargs.pop('norm', None)
-        cmap = kwargs.pop('cmap', None)        
-        vmin = kwargs.pop('vmin', None)
-        vmax = kwargs.pop('vmax', None)        
-        shading = kwargs.pop('shading', 'faceted')
-        if len(kwargs):
-            raise TypeError, 'Unknown argument "%s"'%kwargs.keys()[0]
+        alpha = kwargs.get('alpha', 1.0)
+        norm = kwargs.get('norm', None)
+        cmap = kwargs.get('cmap', None)        
+        vmin = kwargs.get('vmin', None)
+        vmax = kwargs.get('vmax', None)        
+        shading = kwargs.get('shading', 'faceted')
 
         if len(args)==1:
             C = args[0]
@@ -1716,12 +1715,10 @@ def pcolor_classic(self, *args, **kwargs):
         """
 
         if not self._hold: self.cla()
-        shading = kwargs.pop('shading', 'faceted')
-        cmap = kwargs.pop('cmap', cm.get_cmap())
-        norm = kwargs.pop('norm', normalize())
-        alpha = kwargs.pop('alpha', 1.0)
-        if len(kwargs):
-            raise TypeError, 'Unknown argument "%s"'%kwargs.keys()[0]
+        shading = kwargs.get('shading', 'faceted')
+        cmap = kwargs.get('cmap', cm.get_cmap())
+        norm = kwargs.get('norm', normalize())
+        alpha = kwargs.get('alpha', 1.0)
 
         if len(args)==1:
             C = args[0]
@@ -2225,11 +2222,12 @@ def semilogx(self, *args, **kwargs):
 
         """
 
-        d = {'basex': kwargs.pop('basex', 10),
-             'subsx': kwargs.pop('subsx', None),
+        d = {'basex': kwargs.get('basex', 10),
+             'subsx': kwargs.get('subsx', None),
              }
 
         self.set_xscale('log', **d)
+        dict_delall( kwargs, ('basex', 'subsx')) 
         l = self.plot(*args, **kwargs)
         return l
 
@@ -2251,11 +2249,11 @@ def semilogy(self, *args, **kwargs):
       range(2,basey)
 
         """
-        d = {'basey': kwargs.pop('basey', 10),
-             'subsy': kwargs.pop('subsy', None),
+        d = {'basey': kwargs.get('basey', 10),
+             'subsy': kwargs.get('subsy', None),
              }
-
         self.set_yscale('log', **d)
+        dict_delall( kwargs, ('basey', 'subsy')) 
         l = self.plot(*args, **kwargs)
         return l
 

lib/matplotlib/backends/backend_ps.py

@@ -4,9 +4,8 @@
 """
 
 from __future__ import division
-import sys, os
+import sys, os, time
 from cStringIO import StringIO
-from datetime import datetime
 from matplotlib import verbose, __version__
 from matplotlib._matlab_helpers import Gcf
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
@@ -581,7 +580,7 @@ def print_figure(self, outfile, dpi=72,
         if title: print >>fh, "%%Title: "+title
         print >>fh, ("%%Creator: matplotlib version "
                      +__version__+", http://matplotlib.sourceforge.net/")
-        print >>fh, "%%CreationDate: "+datetime.today().ctime()
+        print >>fh, "%%CreationDate: "+time.ctime(time.time())
         if not isEPSF:
             if paperWidth > paperHeight:
                 ostr="Landscape"

lib/matplotlib/cbook.py

@@ -217,6 +217,13 @@ def mkdirs(newdir, mode=0777):
          raise
 
 
+def dict_delall(d, keys):
+    'delete all of the keys from the dict d'
+    for key in keys:
+        try: del d[key]
+        except KeyError: pass
+        
+
 class RingBuffer:
     """ class that implements a not-yet-full buffer """
     def __init__(self,size_max):

lib/matplotlib/figure.py

@@ -1,7 +1,7 @@
 import sys
 from artist import Artist
 from axes import Axes, Subplot, PolarSubplot, PolarAxes
-from cbook import flatten, True, False, allequal
+from cbook import flatten, True, False, allequal, dict_delall
 import _image
 from colors import normalize
 from image import FigureImage
@@ -191,7 +191,7 @@ def add_subplot(self, *args, **kwargs):
         The Axes instance will be returned
         """
         ispolar = kwargs.get('polar', False)
-
+        dict_delall(kwargs, ('polar', ) )
         if ispolar:
             a = PolarSubplot(self, *args, **kwargs)
         else: