Permalink
Browse files

Merge pull request #1590 from cgohlke/patch-1

Positional argument specifiers are required by Python 2.6
  • Loading branch information...
2 parents ccb923e + 9ed51ec commit 19d6dba9745130db850ac97bf156ac06fa12e187 @pelson pelson committed Dec 12, 2012
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

0 comments on commit 19d6dba

Please sign in to comment.