Merge pull request #655 from practicalswift/python-cleanups

Cleanups of various Python scripts

Author: gribozavr

docs/conf.py

@@ -10,7 +10,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

test/Driver/Dependencies/Inputs/fake-build-for-bitcode.py

@@ -6,7 +6,6 @@
 from __future__ import print_function
 
 import os
-import shutil
 import sys
 
 assert sys.argv[1] == '-frontend'

test/Driver/Dependencies/Inputs/fake-build-whole-module.py

@@ -5,7 +5,6 @@
 from __future__ import print_function
 
 import os
-import shutil
 import sys
 
 assert sys.argv[1] == '-frontend'

test/Driver/Dependencies/Inputs/modify-non-primary-files.py

@@ -6,7 +6,6 @@
 from __future__ import print_function
 
 import os
-import shutil
 import sys
 
 assert sys.argv[1] == '-frontend'

utils/GYBUnicodeDataUtils.py

@@ -248,7 +248,7 @@ def create_tables(self):
         # maximum Unicode code point value is not 2^21-1 (0x1fffff), it is
         # 0x10ffff.
         self.supp_first_level_index_max = \
-            0x10ffff >> (self.supp_second_level_index_bits + \
+            0x10ffff >> (self.supp_second_level_index_bits +
                 self.supp_data_offset_bits)
 
         # A mapping from BMP first-level index to BMP data block index.

utils/SwiftBuildSupport.py

@@ -155,8 +155,8 @@ def _get_preset_options_impl(config, substitutions, preset_name):
             # Split on newlines and filter out empty lines.
             mixins = filter(None, [m.strip() for m in a.splitlines()])
             for mixin in mixins:
-                (base_build_script_opts, \
-                    base_build_script_impl_opts, \
+                (base_build_script_opts,
+                    base_build_script_impl_opts,
                     base_missing_opts) = \
                     _get_preset_options_impl(config, substitutions, mixin)
                 build_script_opts += base_build_script_opts
@@ -187,8 +187,8 @@ def get_preset_options(substitutions, preset_file_names, preset_name):
         print_with_argv0("preset '" + preset_name + "' not found")
         sys.exit(1)
     if missing_opts:
-        print_with_argv0("missing option(s) for preset '" + preset_name + \
-        "': " + ", ".join(missing_opts))
+        print_with_argv0("missing option(s) for preset '" + preset_name +
+                         "': " + ", ".join(missing_opts))
         sys.exit(1)
 
     return build_script_opts + [ "--" ] + build_script_impl_opts

utils/apply-fixit-edits.py

@@ -14,7 +14,6 @@
 
 from __future__ import print_function
 
-import subprocess
 import json
 import argparse
 import sys
@@ -31,7 +30,7 @@ def apply_edits(path):
     remap_files = find_remap_files(path)
     if not remap_files:
         print("No remap files found")
-        return 1;
+        return 1
 
     edits_set = set()
     for remap_file in remap_files:
@@ -49,7 +48,7 @@ def apply_edits(path):
     edits_per_file = {}
     for ed in edits_set:
         fname = ed[0]
-        if not edits_per_file.has_key(fname):
+        if fname not in edits_per_file:
             edits_per_file[fname] = []
         edits_per_file[fname].append((ed[1], ed[2], ed[3]))
 

utils/gyb.py

@@ -478,7 +478,6 @@ def tokenGenerator(self, baseTokens):
             elif kind == 'gybLines':
 
                 self.codeStartLine = self.posToLine(self.tokenMatch.start('gybLines'))
-                codeStartPos = self.tokenMatch.end('_indent')
                 indentation = self.tokenMatch.group('_indent')
 
                 # Strip off the leading indentation and %-sign

utils/line-directive

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 #convert line numbers in error messages according to "line directive" comments
-import os
 import sys
 import re
 import bisect

utils/pre-commit-benchmark

@@ -14,7 +14,6 @@ import subprocess
 import sys
 import os
 import re
-import shutil
 import argparse
 from pipes import quote as shell_quote
 
@@ -167,7 +166,7 @@ def parseFloat(word):
     try:
         return float(word)
     except:
-        raise ScoreParserException("Expected float val, not "+word)
+        raise Exception("Expected float val, not {}".format(word))
 
 def getScores(fname):
     scores = {}
@@ -289,7 +288,7 @@ if __name__ == '__main__':
                         action='append', help='Optimization levels to test')
     parser.add_argument(dest='baseline', nargs='?', metavar='tree-ish', default='origin/master',
                         help='the baseline Git commit to compare with.')
-    parser.add_argument(dest='build_script_args', nargs=argparse.REMAINDER, metavar='build-script-args', default=[]
+    parser.add_argument(dest='build_script_args', nargs=argparse.REMAINDER, metavar='build-script-args', default=[],
                         help='additional arguments to build script, e.g. -- --distcc --build-args=-j30')
     args = parser.parse_args()
 

utils/pygments/swift.py

@@ -2,7 +2,7 @@
 
 import re
 
-from pygments.lexer import Lexer, RegexLexer, include, bygroups, using, this, do_insertions
+from pygments.lexer import RegexLexer, include, bygroups
 from pygments.token import *
 
 __all__ = ['SwiftLexer', 'SwiftConsoleLexer']

utils/sil-opt-verify-all-modules.py

@@ -17,7 +17,6 @@
 import glob
 import multiprocessing
 import os
-import shutil
 import subprocess
 import sys
 import tempfile
@@ -76,11 +75,6 @@ def get_verify_resource_dir_modules_commands(
     commands = []
     module_cache_dir = tempfile.mkdtemp(prefix="swift-testsuite-clang-module-cache")
     for (subdir, arch, triple) in known_platforms:
-        platform_frameworks_dir = os.path.join(
-            subprocess.check_output([
-              'xcrun', '--toolchain', toolchain_name, '--show-sdk-platform-path'
-            ]).strip(),
-            'Developer', 'Library', 'Frameworks')
         modules_dir = os.path.join(resource_dir, subdir, arch)
         print(modules_dir)
         modules = glob.glob(os.path.join(modules_dir, '*.swiftmodule'))

utils/swift-bench.py

@@ -38,7 +38,6 @@
 
 import subprocess
 import numpy
-import time
 import re
 import os
 import sys
@@ -299,7 +298,6 @@ def runBench(self, name):
       return
     samples = []
     self.log("Running bench: %s, numsamples: %d" % (name, numSamples), 2)
-    output = ""
     for i in range(0,numSamples):
       try:
         r = self.runCommand([self.tests[name].binary, str(iterScale),

utils/update-checkout

@@ -68,7 +68,7 @@ def obtain_additional_swift_sources(opts = {'with_ssh': False}):
         with WorkingDirectory(SWIFT_SOURCE_ROOT):
             if not os.path.isdir(os.path.join(dir_name, ".git")):
                 print("--- Cloning '" + dir_name + "' ---")
-                if opts['with_ssh'] == True:
+                if opts['with_ssh'] is True:
                     remote = "[email protected]:" + repo + '.git'
                 else:
                     remote = "https://github.com/" + repo + '.git'

utils/viewcfg

@@ -121,7 +121,7 @@ def main():
     newBlocks = { }
     for name, block in blocks.iteritems():
         for adjName in (block.preds + block.getSuccs()):
-            if not adjName in blocks:
+            if adjName not in blocks:
                 newBlocks[adjName] = Block(adjName, None)
 
     blocks = dict(blocks.items() + newBlocks.items())
@@ -132,7 +132,7 @@ def main():
     for name, block in blocks.iteritems():
         for predName in block.preds:
             predBlock = blocks[predName]
-            if not name in predBlock.getSuccs():
+            if name not in predBlock.getSuccs():
                 predBlock.getSuccs().append(name)
 
     # Write the output dot file.
@@ -143,16 +143,16 @@ def main():
     outFile.write('digraph "CFG" {\n')
     for name, block in blocks.iteritems():
         if block.content is not None:
-            outFile.write("\tNode" + str(block.index) + \
+            outFile.write("\tNode" + str(block.index) +
                 " [shape=record,label=\"{" + block.content + "}\"];\n")
         else:
-            outFile.write("\tNode" + str(block.index) + \
-                " [shape=record,color=gray,fontcolor=gray,label=\"{" + \
+            outFile.write("\tNode" + str(block.index) +
+                " [shape=record,color=gray,fontcolor=gray,label=\"{" +
                 block.name + "}\"];\n")
 
         for succName in block.getSuccs():
             succBlock = blocks[succName]
-            outFile.write("\tNode" + str(block.index) + " -> Node" + \
+            outFile.write("\tNode" + str(block.index) + " -> Node" +
                 str(succBlock.index) + ";\n")
 
     outFile.write("}\n")