some Python nits and fixes

2 files changed, 15 insertions, 19 deletions

diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index a05700c1af4..73022b99a8f 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -81,14 +81,15 @@ def run(args, verbose=False):
 
 def stage0_data(rust_root):
     nightlies = os.path.join(rust_root, "src/stage0.txt")
+    data = {}
     with open(nightlies, 'r') as nightlies:
-        data = {}
-        for line in nightlies.read().split("\n"):
+        for line in nightlies:
+            line = line.rstrip()  # Strip newline character, '\n'
             if line.startswith("#") or line == '':
                 continue
             a, b = line.split(": ", 1)
             data[a] = b
-        return data
+    return data
 
 class RustBuild:
     def download_stage0(self):
@@ -219,7 +220,7 @@ class RustBuild:
                  env)
 
     def run(self, args, env):
-        proc = subprocess.Popen(args, env = env)
+        proc = subprocess.Popen(args, env=env)
         ret = proc.wait()
         if ret != 0:
             sys.exit(ret)
@@ -234,20 +235,19 @@ class RustBuild:
         try:
             ostype = subprocess.check_output(['uname', '-s']).strip()
             cputype = subprocess.check_output(['uname', '-m']).strip()
-        except FileNotFoundError:
+        except subprocess.CalledProcessError:
             if sys.platform == 'win32':
                 return 'x86_64-pc-windows-msvc'
-            else:
-                err = "uname not found"
-                if self.verbose:
-                    raise Exception(err)
-                sys.exit(err)
+            err = "uname not found"
+            if self.verbose:
+                raise Exception(err)
+            sys.exit(err)
 
         # Darwin's `uname -s` lies and always returns i386. We have to use
         # sysctl instead.
         if ostype == 'Darwin' and cputype == 'i686':
             sysctl = subprocess.check_output(['sysctl', 'hw.optional.x86_64'])
-            if sysctl.contains(': 1'):
+            if ': 1' in sysctl:
                 cputype = 'x86_64'
 
         # The goal here is to come up with the same triple as LLVM would,
diff --git a/src/etc/get-stage0.py b/src/etc/get-stage0.py
index 3a609957faf..6f3837d3b53 100644
--- a/src/etc/get-stage0.py
+++ b/src/etc/get-stage0.py
@@ -11,18 +11,15 @@
 # except according to those terms.
 
 import os
-import shutil
 import sys
-import tarfile
 
 path = os.path.abspath(os.path.join(os.path.dirname(__file__), "../bootstrap"))
 sys.path.append(path)
 
 import bootstrap
 
-def main(argv):
+def main(triple):
     src_root = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
-    triple = argv[1]
     data = bootstrap.stage0_data(src_root)
 
     channel, date = data['rustc'].split('-', 1)
@@ -31,9 +28,8 @@ def main(argv):
     if not os.path.exists(dl_dir):
         os.makedirs(dl_dir)
 
-    filename_base = 'rustc-' + channel + '-' + triple
-    filename = filename_base + '.tar.gz'
-    url = 'https://static.rust-lang.org/dist/' + date + '/' + filename
+    filename = 'rustc-{}-{}.tar.gz'.format(channel, triple)
+    url = 'https://static.rust-lang.org/dist/{}/{}'.format(date, filename)
     dst = dl_dir + '/' + filename
     if not os.path.exists(dst):
         bootstrap.get(url, dst)
@@ -48,4 +44,4 @@ def main(argv):
     bootstrap.unpack(dst, stage0_dst, match='rustc', verbose=True)
 
 if __name__ == '__main__':
-    main(sys.argv)
+    main(sys.argv[1])