Change print statements to work in python3
This is part of a series of changes to introduce Python3 support.
Change-Id: I373be5de7141aa127d7debdbce1df39148dbec32
diff --git a/subcmds/upload.py b/subcmds/upload.py
index 925652c..a6ada33 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import print_function
import copy
import re
import sys
@@ -26,16 +27,18 @@
def _ConfirmManyUploads(multiple_branches=False):
if multiple_branches:
- print "ATTENTION: One or more branches has an unusually high number of commits."
+ print('ATTENTION: One or more branches has an unusually high number'
+ 'of commits.')
else:
- print "ATTENTION: You are uploading an unusually high number of commits."
- print "YOU PROBABLY DO NOT MEAN TO DO THIS. (Did you rebase across branches?)"
+ print('ATTENTION: You are uploading an unusually high number of commits.')
+ print('YOU PROBABLY DO NOT MEAN TO DO THIS. (Did you rebase across'
+ 'branches?)')
answer = raw_input("If you are sure you intend to do this, type 'yes': ").strip()
return answer == "yes"
def _die(fmt, *args):
msg = fmt % args
- print >>sys.stderr, 'error: %s' % msg
+ print('error: %s' % msg, file=sys.stderr)
sys.exit(1)
def _SplitEmails(values):
@@ -176,14 +179,14 @@
date = branch.date
commit_list = branch.commits
- print 'Upload project %s/ to remote branch %s:' % (project.relpath, project.revisionExpr)
- print ' branch %s (%2d commit%s, %s):' % (
+ print('Upload project %s/ to remote branch %s:' % (project.relpath, project.revisionExpr))
+ print(' branch %s (%2d commit%s, %s):' % (
name,
len(commit_list),
len(commit_list) != 1 and 's' or '',
- date)
+ date))
for commit in commit_list:
- print ' %s' % commit
+ print(' %s' % commit)
sys.stdout.write('to %s (y/N)? ' % remote.review)
answer = sys.stdin.readline().strip().lower()
@@ -317,7 +320,7 @@
sys.stdout.write('Uncommitted changes in ' + branch.project.name + ' (did you forget to amend?). Continue uploading? (y/N) ')
a = sys.stdin.readline().strip().lower()
if a not in ('y', 'yes', 't', 'true', 'on'):
- print >>sys.stderr, "skipping upload"
+ print("skipping upload", file=sys.stderr)
branch.uploaded = False
branch.error = 'User aborted'
continue
@@ -334,8 +337,8 @@
branch.uploaded = False
have_errors = True
- print >>sys.stderr, ''
- print >>sys.stderr, '----------------------------------------------------------------------'
+ print(file=sys.stderr)
+ print('----------------------------------------------------------------------', file=sys.stderr)
if have_errors:
for branch in todo:
@@ -344,17 +347,19 @@
fmt = ' (%s)'
else:
fmt = '\n (%s)'
- print >>sys.stderr, ('[FAILED] %-15s %-15s' + fmt) % (
+ print(('[FAILED] %-15s %-15s' + fmt) % (
branch.project.relpath + '/', \
branch.name, \
- str(branch.error))
- print >>sys.stderr, ''
+ str(branch.error)),
+ file=sys.stderr)
+ print()
for branch in todo:
if branch.uploaded:
- print >>sys.stderr, '[OK ] %-15s %s' % (
+ print('[OK ] %-15s %s' % (
branch.project.relpath + '/',
- branch.name)
+ branch.name),
+ file=sys.stderr)
if have_errors:
sys.exit(1)
@@ -385,7 +390,7 @@
try:
hook.Run(opt.allow_all_hooks, project_list=pending_proj_names)
except HookError as e:
- print >>sys.stderr, "ERROR: %s" % str(e)
+ print("ERROR: %s" % str(e), file=sys.stderr)
return
if opt.reviewers:
@@ -395,7 +400,7 @@
people = (reviewers,cc)
if not pending:
- print >>sys.stdout, "no branches ready for upload"
+ print("no branches ready for upload", file=sys.stderr)
elif len(pending) == 1 and len(pending[0][1]) == 1:
self._SingleBranch(opt, pending[0][1][0], people)
else: