Merge "Do not use print_function from __future__"

This commit is contained in:
Conley Owens 2013-09-27 17:28:07 +00:00 committed by Gerrit Code Review
commit 730ce4c3c2

105
repo
View File

@ -2,7 +2,6 @@
## repo default configuration ## repo default configuration
## ##
from __future__ import print_function
REPO_URL = 'https://gerrit.googlesource.com/git-repo' REPO_URL = 'https://gerrit.googlesource.com/git-repo'
REPO_REV = 'stable' REPO_REV = 'stable'
@ -128,15 +127,23 @@ else:
urllib.request = urllib2 urllib.request = urllib2
urllib.error = urllib2 urllib.error = urllib2
def _print(*objects, **kwargs):
sep = kwargs.get('sep', ' ')
end = kwargs.get('end', '\n')
out = kwargs.get('file', sys.stdout)
out.write(sep.join(objects) + end)
# Python version check # Python version check
ver = sys.version_info ver = sys.version_info
if ver[0] == 3: if ver[0] == 3:
print('error: Python 3 support is not fully implemented in repo yet.\n' _print('error: Python 3 support is not fully implemented in repo yet.\n'
'Please use Python 2.6 - 2.7 instead.', 'Please use Python 2.6 - 2.7 instead.',
file=sys.stderr) file=sys.stderr)
sys.exit(1) sys.exit(1)
if (ver[0], ver[1]) < MIN_PYTHON_VERSION: if (ver[0], ver[1]) < MIN_PYTHON_VERSION:
print('error: Python version %s unsupported.\n' _print('error: Python version %s unsupported.\n'
'Please use Python 2.6 - 2.7 instead.' 'Please use Python 2.6 - 2.7 instead.'
% sys.version.split(' ')[0], file=sys.stderr) % sys.version.split(' ')[0], file=sys.stderr)
sys.exit(1) sys.exit(1)
@ -230,14 +237,14 @@ def _Init(args):
if branch.startswith('refs/heads/'): if branch.startswith('refs/heads/'):
branch = branch[len('refs/heads/'):] branch = branch[len('refs/heads/'):]
if branch.startswith('refs/'): if branch.startswith('refs/'):
print("fatal: invalid branch name '%s'" % branch, file=sys.stderr) _print("fatal: invalid branch name '%s'" % branch, file=sys.stderr)
raise CloneFailure() raise CloneFailure()
if not os.path.isdir(repodir): if not os.path.isdir(repodir):
try: try:
os.mkdir(repodir) os.mkdir(repodir)
except OSError as e: except OSError as e:
print('fatal: cannot make %s directory: %s' _print('fatal: cannot make %s directory: %s'
% (repodir, e.strerror), file=sys.stderr) % (repodir, e.strerror), file=sys.stderr)
# Don't raise CloneFailure; that would delete the # Don't raise CloneFailure; that would delete the
# name. Instead exit immediately. # name. Instead exit immediately.
@ -262,7 +269,7 @@ def _Init(args):
_Checkout(dst, branch, rev, opt.quiet) _Checkout(dst, branch, rev, opt.quiet)
except CloneFailure: except CloneFailure:
if opt.quiet: if opt.quiet:
print('fatal: repo init failed; run without --quiet to see why', _print('fatal: repo init failed; run without --quiet to see why',
file=sys.stderr) file=sys.stderr)
raise raise
@ -272,11 +279,11 @@ def _CheckGitVersion():
try: try:
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE) proc = subprocess.Popen(cmd, stdout=subprocess.PIPE)
except OSError as e: except OSError as e:
print(file=sys.stderr) _print(file=sys.stderr)
print("fatal: '%s' is not available" % GIT, file=sys.stderr) _print("fatal: '%s' is not available" % GIT, file=sys.stderr)
print('fatal: %s' % e, file=sys.stderr) _print('fatal: %s' % e, file=sys.stderr)
print(file=sys.stderr) _print(file=sys.stderr)
print('Please make sure %s is installed and in your path.' % GIT, _print('Please make sure %s is installed and in your path.' % GIT,
file=sys.stderr) file=sys.stderr)
raise CloneFailure() raise CloneFailure()
@ -285,14 +292,14 @@ def _CheckGitVersion():
proc.wait() proc.wait()
if not ver_str.startswith('git version '): if not ver_str.startswith('git version '):
print('error: "%s" unsupported' % ver_str, file=sys.stderr) _print('error: "%s" unsupported' % ver_str, file=sys.stderr)
raise CloneFailure() raise CloneFailure()
ver_str = ver_str[len('git version '):].strip() ver_str = ver_str[len('git version '):].strip()
ver_act = tuple(map(int, ver_str.split('.')[0:3])) ver_act = tuple(map(int, ver_str.split('.')[0:3]))
if ver_act < MIN_GIT_VERSION: if ver_act < MIN_GIT_VERSION:
need = '.'.join(map(str, MIN_GIT_VERSION)) need = '.'.join(map(str, MIN_GIT_VERSION))
print('fatal: git %s or later required' % need, file=sys.stderr) _print('fatal: git %s or later required' % need, file=sys.stderr)
raise CloneFailure() raise CloneFailure()
@ -319,7 +326,7 @@ def SetupGnuPG(quiet):
try: try:
os.mkdir(home_dot_repo) os.mkdir(home_dot_repo)
except OSError as e: except OSError as e:
print('fatal: cannot make %s directory: %s' _print('fatal: cannot make %s directory: %s'
% (home_dot_repo, e.strerror), file=sys.stderr) % (home_dot_repo, e.strerror), file=sys.stderr)
sys.exit(1) sys.exit(1)
@ -327,7 +334,7 @@ def SetupGnuPG(quiet):
try: try:
os.mkdir(gpg_dir, stat.S_IRWXU) os.mkdir(gpg_dir, stat.S_IRWXU)
except OSError as e: except OSError as e:
print('fatal: cannot make %s directory: %s' % (gpg_dir, e.strerror), _print('fatal: cannot make %s directory: %s' % (gpg_dir, e.strerror),
file=sys.stderr) file=sys.stderr)
sys.exit(1) sys.exit(1)
@ -341,18 +348,18 @@ def SetupGnuPG(quiet):
stdin = subprocess.PIPE) stdin = subprocess.PIPE)
except OSError as e: except OSError as e:
if not quiet: if not quiet:
print('warning: gpg (GnuPG) is not available.', file=sys.stderr) _print('warning: gpg (GnuPG) is not available.', file=sys.stderr)
print('warning: Installing it is strongly encouraged.', file=sys.stderr) _print('warning: Installing it is strongly encouraged.', file=sys.stderr)
print(file=sys.stderr) _print(file=sys.stderr)
return False return False
proc.stdin.write(MAINTAINER_KEYS) proc.stdin.write(MAINTAINER_KEYS)
proc.stdin.close() proc.stdin.close()
if proc.wait() != 0: if proc.wait() != 0:
print('fatal: registering repo maintainer keys failed', file=sys.stderr) _print('fatal: registering repo maintainer keys failed', file=sys.stderr)
sys.exit(1) sys.exit(1)
print() _print()
fd = open(os.path.join(home_dot_repo, 'keyring-version'), 'w') fd = open(os.path.join(home_dot_repo, 'keyring-version'), 'w')
fd.write('.'.join(map(str, KEYRING_VERSION)) + '\n') fd.write('.'.join(map(str, KEYRING_VERSION)) + '\n')
@ -394,7 +401,7 @@ def _InitHttp():
def _Fetch(url, local, src, quiet): def _Fetch(url, local, src, quiet):
if not quiet: if not quiet:
print('Get %s' % url, file=sys.stderr) _print('Get %s' % url, file=sys.stderr)
cmd = [GIT, 'fetch'] cmd = [GIT, 'fetch']
if quiet: if quiet:
@ -443,16 +450,16 @@ def _DownloadBundle(url, local, quiet):
except urllib.error.HTTPError as e: except urllib.error.HTTPError as e:
if e.code in [403, 404]: if e.code in [403, 404]:
return False return False
print('fatal: Cannot get %s' % url, file=sys.stderr) _print('fatal: Cannot get %s' % url, file=sys.stderr)
print('fatal: HTTP error %s' % e.code, file=sys.stderr) _print('fatal: HTTP error %s' % e.code, file=sys.stderr)
raise CloneFailure() raise CloneFailure()
except urllib.error.URLError as e: except urllib.error.URLError as e:
print('fatal: Cannot get %s' % url, file=sys.stderr) _print('fatal: Cannot get %s' % url, file=sys.stderr)
print('fatal: error %s' % e.reason, file=sys.stderr) _print('fatal: error %s' % e.reason, file=sys.stderr)
raise CloneFailure() raise CloneFailure()
try: try:
if not quiet: if not quiet:
print('Get %s' % url, file=sys.stderr) _print('Get %s' % url, file=sys.stderr)
while True: while True:
buf = r.read(8192) buf = r.read(8192)
if buf == '': if buf == '':
@ -476,7 +483,7 @@ def _Clone(url, local, quiet):
try: try:
os.mkdir(local) os.mkdir(local)
except OSError as e: except OSError as e:
print('fatal: cannot make %s directory: %s' % (local, e.strerror), _print('fatal: cannot make %s directory: %s' % (local, e.strerror),
file=sys.stderr) file=sys.stderr)
raise CloneFailure() raise CloneFailure()
@ -484,15 +491,15 @@ def _Clone(url, local, quiet):
try: try:
proc = subprocess.Popen(cmd, cwd = local) proc = subprocess.Popen(cmd, cwd = local)
except OSError as e: except OSError as e:
print(file=sys.stderr) _print(file=sys.stderr)
print("fatal: '%s' is not available" % GIT, file=sys.stderr) _print("fatal: '%s' is not available" % GIT, file=sys.stderr)
print('fatal: %s' % e, file=sys.stderr) _print('fatal: %s' % e, file=sys.stderr)
print(file=sys.stderr) _print(file=sys.stderr)
print('Please make sure %s is installed and in your path.' % GIT, _print('Please make sure %s is installed and in your path.' % GIT,
file=sys.stderr) file=sys.stderr)
raise CloneFailure() raise CloneFailure()
if proc.wait() != 0: if proc.wait() != 0:
print('fatal: could not create %s' % local, file=sys.stderr) _print('fatal: could not create %s' % local, file=sys.stderr)
raise CloneFailure() raise CloneFailure()
_InitHttp() _InitHttp()
@ -520,18 +527,18 @@ def _Verify(cwd, branch, quiet):
proc.stderr.close() proc.stderr.close()
if proc.wait() != 0 or not cur: if proc.wait() != 0 or not cur:
print(file=sys.stderr) _print(file=sys.stderr)
print("fatal: branch '%s' has not been signed" % branch, file=sys.stderr) _print("fatal: branch '%s' has not been signed" % branch, file=sys.stderr)
raise CloneFailure() raise CloneFailure()
m = re.compile(r'^(.*)-[0-9]{1,}-g[0-9a-f]{1,}$').match(cur) m = re.compile(r'^(.*)-[0-9]{1,}-g[0-9a-f]{1,}$').match(cur)
if m: if m:
cur = m.group(1) cur = m.group(1)
if not quiet: if not quiet:
print(file=sys.stderr) _print(file=sys.stderr)
print("info: Ignoring branch '%s'; using tagged release '%s'" _print("info: Ignoring branch '%s'; using tagged release '%s'"
% (branch, cur), file=sys.stderr) % (branch, cur), file=sys.stderr)
print(file=sys.stderr) _print(file=sys.stderr)
env = os.environ.copy() env = os.environ.copy()
env['GNUPGHOME'] = gpg_dir.encode() env['GNUPGHOME'] = gpg_dir.encode()
@ -549,10 +556,10 @@ def _Verify(cwd, branch, quiet):
proc.stderr.close() proc.stderr.close()
if proc.wait() != 0: if proc.wait() != 0:
print(file=sys.stderr) _print(file=sys.stderr)
print(out, file=sys.stderr) _print(out, file=sys.stderr)
print(err, file=sys.stderr) _print(err, file=sys.stderr)
print(file=sys.stderr) _print(file=sys.stderr)
raise CloneFailure() raise CloneFailure()
return '%s^0' % cur return '%s^0' % cur
@ -619,7 +626,7 @@ def _ParseArguments(args):
def _Usage(): def _Usage():
print( _print(
"""usage: repo COMMAND [ARGS] """usage: repo COMMAND [ARGS]
repo is not yet installed. Use "repo init" to install it here. repo is not yet installed. Use "repo init" to install it here.
@ -640,7 +647,7 @@ def _Help(args):
init_optparse.print_help() init_optparse.print_help()
sys.exit(0) sys.exit(0)
else: else:
print("error: '%s' is not a bootstrap command.\n" _print("error: '%s' is not a bootstrap command.\n"
' For access to online help, install repo ("repo init").' ' For access to online help, install repo ("repo init").'
% args[0], file=sys.stderr) % args[0], file=sys.stderr)
else: else:
@ -649,13 +656,13 @@ def _Help(args):
def _NotInstalled(): def _NotInstalled():
print('error: repo is not installed. Use "repo init" to install it here.', _print('error: repo is not installed. Use "repo init" to install it here.',
file=sys.stderr) file=sys.stderr)
sys.exit(1) sys.exit(1)
def _NoCommands(cmd): def _NoCommands(cmd):
print("""error: command '%s' requires repo to be installed first. _print("""error: command '%s' requires repo to be installed first.
Use "repo init" to install it here.""" % cmd, file=sys.stderr) Use "repo init" to install it here.""" % cmd, file=sys.stderr)
sys.exit(1) sys.exit(1)
@ -693,7 +700,7 @@ def _SetDefaultsTo(gitdir):
proc.stderr.close() proc.stderr.close()
if proc.wait() != 0: if proc.wait() != 0:
print('fatal: %s has no current branch' % gitdir, file=sys.stderr) _print('fatal: %s has no current branch' % gitdir, file=sys.stderr)
sys.exit(1) sys.exit(1)
@ -742,8 +749,8 @@ def main(orig_args):
try: try:
os.execv(repo_main, me) os.execv(repo_main, me)
except OSError as e: except OSError as e:
print("fatal: unable to start %s" % repo_main, file=sys.stderr) _print("fatal: unable to start %s" % repo_main, file=sys.stderr)
print("fatal: %s" % e, file=sys.stderr) _print("fatal: %s" % e, file=sys.stderr)
sys.exit(148) sys.exit(148)