From ef900cbdcb0e544639ae10b390a68da2afd8bcce Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Sun, 15 Jan 2017 15:19:13 -0500 Subject: [PATCH] Avoid hardcoded references to rustc in download() Use the `desc` parameter instead to make the error messages customized for the actual download. Also use new-style format strings. --- python/servo/util.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/python/servo/util.py b/python/servo/util.py index 24d3f411736..03f993b3bf0 100644 --- a/python/servo/util.py +++ b/python/servo/util.py @@ -67,9 +67,9 @@ def host_triple(): def download(desc, src, writer, start_byte=0): if start_byte: - print("Resuming download of %s..." % desc) + print("Resuming download of {}...".format(desc)) else: - print("Downloading %s..." % desc) + print("Downloading {}...".format(desc)) dumb = (os.environ.get("TERM") == "dumb") or (not sys.stdout.isatty()) try: @@ -101,16 +101,16 @@ def download(desc, src, writer, start_byte=0): if not dumb: print() except urllib2.HTTPError, e: - print("Download failed (%d): %s - %s" % (e.code, e.reason, src)) + print("Download failed ({}): {} - {}".format(e.code, e.reason, src)) if e.code == 403: print("No Rust compiler binary available for this platform. " "Please see https://github.com/servo/servo/#prerequisites") sys.exit(1) except urllib2.URLError, e: - print("Error downloading Rust compiler: %s. The failing URL was: %s" % (e.reason, src)) + print("Error downloading {}: {}. The failing URL was: {}".format(desc, e.reason, src)) sys.exit(1) except socket_error, e: - print("Looks like there's a connectivity issue, check your Internet connection. %s" % (e)) + print("Looks like there's a connectivity issue, check your Internet connection. {}".format(e)) sys.exit(1) except KeyboardInterrupt: writer.flush()