Merge branch 'v1.4.x' into master branch

tacaswell · tacaswell · commit d4f86573d792 · 2015-01-31T13:14:35.000-05:00
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -530,9 +530,6 @@ def __init__(self, canvas, num, window):
         self.set_window_title("Figure %d" % num)
         self.canvas = canvas
         self._num =  num
-        _, _, w, h = canvas.figure.bbox.bounds
-        w, h = int(w), int(h)
-        self.window.minsize(int(w*3/4),int(h*3/4))
         if matplotlib.rcParams['toolbar']=='toolbar2':
             self.toolbar = NavigationToolbar2TkAgg( canvas, self.window )
         else:
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -1701,6 +1701,9 @@ def set_paths(self):
         self._paths = self.convert_mesh_to_paths(
             self._meshWidth, self._meshHeight, self._coordinates)
 
+    def get_datalim(self, transData):
+        return (self.get_transform() - transData).transform_bbox(self._bbox)
+
     @staticmethod
     def convert_mesh_to_paths(meshWidth, meshHeight, coordinates):
         """
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -1257,7 +1257,7 @@ def pilread(fname):
         if im is None:
             raise ValueError('Only know how to handle extensions: %s; '
                              'with PIL installed matplotlib can handle '
-                             'more images' % list(six.iterkeys(handlers.keys)))
+                             'more images' % list(six.iterkeys(handlers)))
         return im
 
     handler = handlers[ext]
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -1352,6 +1352,15 @@ def transform_non_affine(self, values):
         """
         return values
 
+    def transform_bbox(self, bbox):
+        """
+        Transform the given bounding box.
+
+        Note, for smarter transforms including caching (a common
+        requirement for matplotlib figures), see :class:`TransformedBbox`.
+        """
+        return Bbox(self.transform(bbox.get_points()))
+
     def get_affine(self):
         """
         Get the affine part of this transform.
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -1008,8 +1008,11 @@ def mouse_init(self, rotate_btn=1, zoom_btn=3):
         else:
             warnings.warn('Axes3D.figure.canvas is \'None\', mouse rotation disabled.  Set canvas then call Axes3D.mouse_init().')
 
-        self._rotate_btn = np.atleast_1d(rotate_btn)
-        self._zoom_btn = np.atleast_1d(zoom_btn)
+        # coerce scalars into array-like, then convert into
+        # a regular list to avoid comparisons against None
+        # which breaks in recent versions of numpy.
+        self._rotate_btn = np.atleast_1d(rotate_btn).tolist()
+        self._zoom_btn = np.atleast_1d(zoom_btn).tolist()
 
     def can_zoom(self) :
         """
