Commit59cb786

committed

Simpler format_shortcut.

1 parentafbbdd6 commit59cb786Copy full SHA for 59cb786

File tree

-10

lines changed

-10

lines changed

Lines changed: 3 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1026,20 +1026,14 @@ class ToolHelpBase(ToolBase):`
`1026`	`1026`	`default_keymap=rcParams['keymap.help']`
`1027`	`1027`	`image='help.png'`
`1028`	`1028`
`1029`		`-`
`1030`	`1029`	`@staticmethod`
`1031`		`-defformat_shortcut(keysequence):`
	`1030`	`+defformat_shortcut(key_sequence):`
`1032`	`1031`	`"""`
`1033`	`1032`	`Converts a shortcut string from the notation used in rc config to the`
`1034`	`1033`	`standard notation for displaying shortcuts, e.g. 'ctrl+a' -> 'Ctrl+A'.`
`1035`	`1034`	`"""`
`1036`		`-defrepl(match):`
`1037`		`-s=match.group(0)`
`1038`		`-return'Shift+'+siflen(`
`1039`		`-s)==1ands.isupper()elses.capitalize()`
`1040`		`-iflen(keysequence)==1:`
`1041`		`-returnkeysequence# do not modify single characters`
`1042`		`-returnre.sub(r"\w{2,}\|(?<=\+)\w",repl,keysequence)`
	`1035`	`+return (key_sequenceiflen(key_sequence)==1else`
	`1036`	`+re.sub(r"\+[A-Z]",r"+Shift\g<0>",key_sequence).title())`
`1043`	`1037`
`1044`	`1038`	`def_format_tool_keymap(self,name):`
`1045`	`1039`	`keymaps=self.toolmanager.get_tool_keymap(name)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,4 @@`
`17`	`17`	`('cmd+1','Cmd+1'),`
`18`	`18`	`])`
`19`	`19`	`deftest_format_shortcut(rc_shortcut,expected):`
`20`		`-assertToolHelpBase.format_shortcut(rc_shortcut)==expected`
	`20`	`+assertToolHelpBase.format_shortcut(rc_shortcut)==expected`

Comments

(0)