This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12339

ui: use input() directly
ClosedPublic

Authored by indygreg on Mar 3 2022, 10:30 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG78f1de3f4be7: ui: use input() directly
Summary

pycompat.rawinput() is an alias to input()

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Mar 3 2022, 10:30 PM
Alphare accepted this revision.Mar 8 2022, 4:32 AM
This revision is now accepted and ready to land.Mar 8 2022, 4:32 AM
Alphare added inline comments.Mar 8 2022, 4:33 AM
mercurial/ui.py
1730

This is no longer raw_input. I'll amend it to save some churn.

indygreg added a commit: rHG78f1de3f4be7: ui: use input() directly.Mar 8 2022, 6:00 AM
Closed by commit rHG78f1de3f4be7: ui: use input() directly (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (4 lines)

Diff 32589

mercurial/ui.py

prompt = self.label(prompt, b'ui.prompt') + b' ' prompt = self.label(prompt, b'ui.prompt') + b' '
# prompt ' ' must exist; otherwise readline may delete entire line # prompt ' ' must exist; otherwise readline may delete entire line
# - http://bugs.python.org/issue12833 # - http://bugs.python.org/issue12833
with self.timeblockedsection(b'stdio'): with self.timeblockedsection(b'stdio'):
if usereadline: if usereadline:
self.flush() self.flush()
prompt = encoding.strfromlocal(prompt) prompt = encoding.strfromlocal(prompt)
line = encoding.strtolocal(pycompat.rawinput(prompt)) line = encoding.strtolocal(input(prompt))
# When stdin is in binary mode on Windows, it can cause # When stdin is in binary mode on Windows, it can cause
# raw_input() to emit an extra trailing carriage return # input() to emit an extra trailing carriage return
AlphareUnsubmitted
Not Done

This is no longer raw_input. I'll amend it to save some churn.

Alphare: This is no longer `raw_input`. I'll amend it to save some churn.
if pycompat.oslinesep == b'\r\n' and line.endswith(b'\r'): if pycompat.oslinesep == b'\r\n' and line.endswith(b'\r'):
line = line[:-1] line = line[:-1]
else: else:
self._fout.write(pycompat.bytestr(prompt)) self._fout.write(pycompat.bytestr(prompt))
self._fout.flush() self._fout.flush()
line = self._fin.readline() line = self._fin.readline()
if not line: if not line:
raise EOFError raise EOFError