Merge remote-tracking branch 'upstream/v1.2.x'

mdboom · mdboom · commit 127f4748bda1 · 2012-12-17T10:05:22.000-05:00
Conflicts:
	lib/matplotlib/backends/backend_gtk.py
	lib/matplotlib/text.py
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -341,7 +341,7 @@ def _get_key(self, event):
                                  [gdk.MOD1_MASK, 'alt'],
                                  [gdk.CONTROL_MASK, 'ctrl'], ):
             if event.state & key_mask:
-                key = '%s+%s' % (prefix, key)
+                key = '{0}+{1}'.format(prefix, key)
 
         return key
 
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -271,7 +271,7 @@ def _get_key(self, event):
                     ]
         for key_mask, prefix in modifiers:
             if event.state & key_mask:
-                key = '{}+{}'.format(prefix, key)
+                key = '{0}+{1}'.format(prefix, key)
 
         return key
 
diff --git a/lib/matplotlib/backends/backend_gtk3agg.py b/lib/matplotlib/backends/backend_gtk3agg.py
@@ -59,8 +59,20 @@ def on_draw_event(self, widget, ctx):
         return False
 
     def blit(self, bbox=None):
+        # If bbox is None, blit the entire canvas to gtk. Otherwise
+        # blit only the area defined by the bbox.
+        if bbox is None:
+            bbox = self.figure.bbox
+
+        allocation = self.get_allocation()
+        w, h = allocation.width, allocation.height
+        x = int(bbox.x0)
+        y = h - int(bbox.y1)
+        width = int(bbox.x1) - int(bbox.x0)
+        height = int(bbox.y1) - int(bbox.y0)
+
         self._bbox_queue.append(bbox)
-        self.queue_draw()
+        self.queue_draw_area(x, y, width, height)
 
     def print_png(self, filename, *args, **kwargs):
         # Do this so we can save the resolution of figure in the PNG file
diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py
@@ -337,7 +337,7 @@ def _get_key( self, event ):
             # prepend the ctrl, alt, super keys if appropriate (sorted in that order)
             for modifier, prefix, Qt_key in self._modifier_keys:
                 if event.key() != Qt_key and int(event.modifiers()) & modifier == modifier:
-                    key = u'{}+{}'.format(prefix, key)
+                    key = u'{0}+{1}'.format(prefix, key)
 
         return key
 
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -467,7 +467,7 @@ def _get_key(self, event):
             # note, shift is not added to the keys as this is already accounted for
             for bitmask, prefix, key_name in modifiers:
                 if event.state & (1 << bitmask) and key_name not in key:
-                    key = '{}+{}'.format(prefix, key)
+                    key = '{0}+{1}'.format(prefix, key)
 
         return key
 
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -1250,7 +1250,7 @@ def _get_key(self, evt):
                              [evt.AltDown, 'alt'],
                              [evt.ControlDown, 'ctrl'], ):
             if meth():
-                key = '{}+{}'.format(prefix, key)
+                key = '{0}+{1}'.format(prefix, key)
 
         return key
 
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -541,7 +541,7 @@ def draw(self, renderer):
             self._renderer = renderer
         if not self.get_visible():
             return
-        if self.get_text() == '':
+        if self.get_text().strip() == '':
             return
 
         renderer.open_group('text', self.get_gid())
@@ -755,7 +755,7 @@ def get_window_extent(self, renderer=None, dpi=None):
         if dpi is not None:
             dpi_orig = self.figure.dpi
             self.figure.dpi = dpi
-        if self.get_text() == '':
+        if self.get_text().strip() == '':
             tx, ty = self._get_xy_display()
             return Bbox.from_bounds(tx, ty, 0, 0)
 
@@ -1926,7 +1926,7 @@ def _update_position_xytext(self, renderer, xy_pixel):
                         props = props.copy()
                         pad = props.pop('pad', 4)
                         pad = renderer.points_to_pixels(pad)
-                        if self.get_text() == "":
+                        if self.get_text().strip() == "":
                             self.arrow_patch.set_patchA(None)
                             return
 

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ def _get_key(self, event):`
`271`	`271`	`]`
`272`	`272`	`for key_mask, prefix in modifiers:`
`273`	`273`	`if event.state & key_mask:`
`274`		`- key = '{}+{}'.format(prefix, key)`
	`274`	`+ key = '{0}+{1}'.format(prefix, key)`
`275`	`275`
`276`	`276`	`return key`
`277`	`277`