Merge pull request #1590 from cgohlke/patch-1

pelson · pelson · commit 19d6dba97451 · 2012-12-12T01:17:53.000-08:00
Positional argument specifiers are required by Python 2.6
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 = '{}+{}'.format(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_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
@@ -1254,7 +1254,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
 

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`