From e641281d144cca09a451497209e748056cdd79bb Mon Sep 17 00:00:00 2001 From: Daniel Kutik Date: Tue, 13 Dec 2022 12:44:47 +0100 Subject: [PATCH] Use print with flush=True instead of stdout.flush Resolves multiple TODOs. Since we are requiring Python 3, we move to using print function with flush=True instead of using sys.stdout.flush(). Change-Id: I54db0344ec78ac81a8d6c6c7e43ee7d301f42f02 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/354701 Tested-by: Daniel Kutik Reviewed-by: Mike Frysinger --- subcmds/init.py | 12 +++--------- subcmds/upload.py | 8 ++------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/subcmds/init.py b/subcmds/init.py index d732374d..26cac62f 100644 --- a/subcmds/init.py +++ b/subcmds/init.py @@ -134,9 +134,7 @@ to update the working directory files. sys.exit(1) def _Prompt(self, prompt, value): - print('%-10s [%s]: ' % (prompt, value), end='') - # TODO: When we require Python 3, use flush=True w/print above. - sys.stdout.flush() + print('%-10s [%s]: ' % (prompt, value), end='', flush=True) a = sys.stdin.readline().strip() if a == '': return value @@ -173,9 +171,7 @@ to update the working directory files. if not opt.quiet: print() print('Your identity is: %s <%s>' % (name, email)) - print('is this correct [y/N]? ', end='') - # TODO: When we require Python 3, use flush=True w/print above. - sys.stdout.flush() + print('is this correct [y/N]? ', end='', flush=True) a = sys.stdin.readline().strip().lower() if a in ('yes', 'y', 't', 'true'): break @@ -217,9 +213,7 @@ to update the working directory files. out.printer(fg='black', attr=c)(' %-6s ', c) out.nl() - print('Enable color display in this user account (y/N)? ', end='') - # TODO: When we require Python 3, use flush=True w/print above. - sys.stdout.flush() + print('Enable color display in this user account (y/N)? ', end='', flush=True) a = sys.stdin.readline().strip().lower() if a in ('y', 'yes', 't', 'true', 'on'): gc.SetString('color.ui', 'auto') diff --git a/subcmds/upload.py b/subcmds/upload.py index ceab6463..5b17fb51 100644 --- a/subcmds/upload.py +++ b/subcmds/upload.py @@ -293,9 +293,7 @@ Gerrit Code Review: https://www.gerritcodereview.com/ for commit in commit_list: print(' %s' % commit) - print('to %s (y/N)? ' % remote.review, end='') - # TODO: When we require Python 3, use flush=True w/print above. - sys.stdout.flush() + print('to %s (y/N)? ' % remote.review, end='', flush=True) if opt.yes: print('<--yes>') answer = True @@ -437,9 +435,7 @@ Gerrit Code Review: https://www.gerritcodereview.com/ print('Uncommitted changes in %s (did you forget to amend?):' % branch.project.name) print('\n'.join(changes)) - print('Continue uploading? (y/N) ', end='') - # TODO: When we require Python 3, use flush=True w/print above. - sys.stdout.flush() + print('Continue uploading? (y/N) ', end='', flush=True) if opt.yes: print('<--yes>') a = 'yes'