Fix bug when specifying both scale and label in the axes constructor. Change to use new numpy putmask API.

svn path=/branches/v0_98_5_maint/; revision=7016

Author: mdboom

lib/matplotlib/axes.py

@@ -439,6 +439,8 @@ def __init__(self, fig, rect,
                  sharex=None, # use Axes instance's xaxis info
                  sharey=None, # use Axes instance's yaxis info
                  label='',
+                 xscale=None,
+                 yscale=None,
                  **kwargs
                  ):
         """
@@ -543,6 +545,11 @@ def __init__(self, fig, rect,
         self.set_navigate(True)
         self.set_navigate_mode(None)
 
+        if xscale:
+            self.set_xscale(xscale)
+        if yscale:
+            self.set_yscale(yscale)
+
         if len(kwargs): martist.setp(self, **kwargs)
 
         if self.xaxis is not None:

lib/matplotlib/transforms.py

@@ -975,8 +975,7 @@ def get_points(self):
         if self._invalid:
             points = self._transform.transform(self._bbox.get_points())
             if ma.isMaskedArray(points):
-                points.putmask(0.0)
-                points = np.asarray(points)
+                np.putmask(points, points.mask, 0.0)
             self._points = points
             self._invalid = 0
         return self._points