Mercurial > hg
changeset 33714:d880a6bcef2f
ui: refactor extractchoices so it doesn't break on Python 3
Differential Revision: https://phab.mercurial-scm.org/D275
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 24 Jul 2017 13:48:32 -0400 |
| parents | 888f24810ea2 |
| children | 29238dbf718e |
| files | mercurial/ui.py |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/ui.py Mon Jul 24 11:29:51 2017 -0400 +++ b/mercurial/ui.py Mon Jul 24 13:48:32 2017 -0400 @@ -1269,9 +1269,10 @@ m = re.match(br'(?s)(.+?)\$\$([^\$]*&[^ \$].*)', prompt) msg = m.group(1) choices = [p.strip(' ') for p in m.group(2).split('$$')] - return (msg, - [(s[s.index('&') + 1].lower(), s.replace('&', '', 1)) - for s in choices]) + def choicetuple(s): + ampidx = s.index('&') + return s[ampidx + 1:ampidx + 2].lower(), s.replace('&', '', 1) + return (msg, [choicetuple(s) for s in choices]) def promptchoice(self, prompt, default=0): """Prompt user with a message, read response, and ensure it matches