Merge pull request #4 from frewsxcv/cleanup

Minor cleanup/refactoring

Author: brson

fetch-inputs.py

@@ -16,10 +16,10 @@
 print "channel: " + str(channel)
 print
 
-if channel == None:
+if channel is None:
     print "specify --channel"
     sys.exit(1)
-if target == None:
+if target is None:
     print "specify --target"
     sys.exit(1)
 
@@ -56,7 +56,7 @@
 rust_artifacts = []
 for line in open(os.path.join(TEMP_DIR, rust_manifest_name)):
     if target in line and ".tar.gz" in line:
-        rust_artifacts += [line.rstrip()]
+        rust_artifacts.append(line.rstrip())
 assert len(rust_artifacts) > 0
 print "rust artifacts: " + str(rust_artifacts)
 
@@ -68,7 +68,7 @@
 for line in open(os.path.join(TEMP_DIR, rust_manifest_name)):
     if "-src" in line:
         rust_source = line.rstrip()
-assert rust_source != None
+assert rust_source is not None
 print "rust source: " + rust_source
 
 # Download the source
@@ -99,7 +99,7 @@
             assert len(version) > 0
             break
 
-    assert version != None
+    assert version is not None
 
     # Search the cargo snap database for this version
     for line in open("cargo-revs.txt"):
@@ -108,15 +108,14 @@
             assert len(cargo_archive_date) > 0
             break
 
-    assert cargo_archive_date != None
+    assert cargo_archive_date is not None
 
 print "cargo date: " + str(cargo_archive_date)
 
 # Download cargo manifest
-if cargo_archive_date == None:
-    remote_cargo_dir = SERVER_ADDRESS + "/" + CARGO_DIST_FOLDER 
-else:
-    remote_cargo_dir = SERVER_ADDRESS + "/" + CARGO_DIST_FOLDER + "/" + cargo_archive_date
+remote_cargo_dir = SERVER_ADDRESS + "/" + CARGO_DIST_FOLDER
+if cargo_archive_date is not None:
+    remote_cargo_dir += "/" + cargo_archive_date
 
 cargo_manifest_name = "channel-cargo-nightly"
 remote_cargo_manifest = remote_cargo_dir + "/" + cargo_manifest_name
@@ -134,7 +133,7 @@
 cargo_artifacts = []
 for line in open(os.path.join(TEMP_DIR, cargo_manifest_name)):
     if target in line:
-        cargo_artifacts += [line.rstrip()]
+        cargo_artifacts.append(line.rstrip())
 assert len(cargo_artifacts) > 0
 print "cargo artifacts: " + str(cargo_artifacts)
 

package-rust.py

@@ -26,7 +26,7 @@
 print "msi: " + str(make_msi)
 print
 
-if target == None:
+if target is None:
     print "specify --target"
     sys.exit(1)
 
@@ -53,7 +53,7 @@ def run(args):
 # The names of the packages that need to be combined via rust-installer
 components = [RUSTC_PACKAGE_NAME, "cargo", "rust-docs"]
 if "pc-windows-gnu" in target:
-    components += ["rust-mingw"]
+    components.append("rust-mingw")
 
 # Now find the names of the tarballs that belong to those components
 inputs = []
@@ -77,7 +77,7 @@ def run(args):
     if not component_installer:
         print "unable to find installer for component " + component + ", target " + target
         sys.exit(1)
-    inputs += [INPUT_DIR + "/" + component_installer]
+    inputs.append(INPUT_DIR + "/" + component_installer)
 
     # Extract the version from the filename
     if component == RUSTC_PACKAGE_NAME:
@@ -93,9 +93,9 @@ def run(args):
         mingw_installer = component_installer
 
 
-assert version != None
-assert rustc_installer != None
-assert source_tarball != None
+assert version is not None
+assert rustc_installer is not None
+assert source_tarball is not None
 
 # Set up the overlay of license info
 run(["tar", "xzf", INPUT_DIR + "/" + rustc_installer, "-C", TEMP_DIR, ])
@@ -123,15 +123,13 @@ def run(args):
      "--legacy-manifest-dirs=rustlib,cargo",
      "--input-tarballs=" + tarball_list,
      "--non-installed-overlay=" + overlay_dir
- ])
+])
 
 # Everything below here is used for producing non-rust-installer packaging
 
 # Create the LICENSE.txt file used in some GUI installers
 license_file = TEMP_DIR + "/LICENSE.txt"
-cmd = "cat " + \
-    rustc_dir + "/COPYRIGHT " + rustc_dir + "/LICENSE-APACHE " + rustc_dir + "/LICENSE-MIT " + \
-    "> " + license_file
+cmd = "cat {0}/COPYRIGHT {0}/LICENSE-APACHE {0}/LICENSE-MIT > {1}".format(rustc_dir, license_file)
 run(["sh", "-c", cmd])
 
 # Fish out the following Makefile variables from the source code or rebuild them somehow.
@@ -147,19 +145,19 @@ def run(args):
 source_dir = os.path.join(TEMP_DIR, source_tarball.replace("-src.tar.gz", ""))
 
 for line in open(source_dir + "/mk/main.mk"):
-    if "CFG_RELEASE_NUM" in line and CFG_RELEASE_NUM == None:
+    if "CFG_RELEASE_NUM" in line and CFG_RELEASE_NUM is None:
         CFG_RELEASE_NUM = line.split("=")[1].strip()
         assert len(CFG_RELEASE_NUM) > 0
-    if "CFG_BETA_CYCLE" in line and CFG_BETA_CYCLE == None:
+    if "CFG_BETA_CYCLE" in line and CFG_BETA_CYCLE is None:
         CFG_BETA_CYCLE = line.split("=")[1].strip()
         # NB: This can be an empty string
 
-assert CFG_RELEASE_NUM != None
+assert CFG_RELEASE_NUM is not None
 
 # FIXME Temporary hack
-if CFG_BETA_CYCLE == None:
+if CFG_BETA_CYCLE is None:
     CFG_BETA_CYCLE = ""
-assert CFG_BETA_CYCLE != None
+assert CFG_BETA_CYCLE is not None
 
 # Guess the channel from the source tarball
 channel = None
@@ -216,9 +214,9 @@ def run(args):
 
 if make_exe:
     print "creating .exe"
-    assert docs_installer != None
-    assert mingw_installer != None
-    assert cargo_installer != None
+    assert docs_installer is not None
+    assert mingw_installer is not None
+    assert cargo_installer is not None
     exe_temp_dir = TEMP_DIR + "/exe"
     os.mkdir(exe_temp_dir)
     run(["tar", "xzf", INPUT_DIR + "/" + rustc_installer, "-C", exe_temp_dir])