Merge pull request #1526 from practicalswift/fix-pep8-violations-ii

[Python] Fix five classes of PEP-8 violations (E101/E111/E128/E302/W191)
This commit is contained in:
Brian Gesiak
2016-03-08 23:55:46 -05:00
38 changed files with 1010 additions and 678 deletions

View File

@@ -65,6 +65,7 @@ SKIPPED_FRAMEWORKS = {
'vecLib',
}
def create_parser():
script_path = os.path.dirname(sys.argv[0])
script_path = os.path.abspath(script_path)
@@ -87,10 +88,12 @@ def create_parser():
parser.add_argument('-I', '--include-dir', action='append', help='Add additional include directories')
return parser
def output_command_result_to_file(command_args, filename):
with open(filename, 'w') as output_file:
subprocess.call(command_args, stdout=output_file)
def run_command(args):
proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out, err = proc.communicate()
@@ -98,6 +101,8 @@ def run_command(args):
return (exitcode, out, err)
# Collect the set of submodules for the given module.
def collect_submodules(common_args, module):
# Execute swift-ide-test to print the interface.
my_args = ['-module-print-submodules', '-module-to-print=%s' % (module)]
@@ -117,6 +122,8 @@ def collect_submodules(common_args, module):
return sorted(list(submodules))
# Print out the command we're about to execute
def print_command(cmd, outfile=""):
str = " ".join(cmd)
if outfile != "":
@@ -124,6 +131,8 @@ def print_command(cmd, outfile=""):
print(str)
# Dump the API for the given module.
def dump_module_api((cmd, extra_dump_args, output_dir, module, quiet, verbose)):
# Collect the submodules
submodules = collect_submodules(cmd, module)
@@ -158,6 +167,7 @@ def dump_module_api((cmd, extra_dump_args, output_dir, module, quiet, verbose)):
return
def pretty_sdk_name(sdk):
if sdk.find("macosx") == 0:
return 'OSX'
@@ -170,6 +180,8 @@ def pretty_sdk_name(sdk):
return 'unknownOS'
# Collect the set of frameworks we should dump
def collect_frameworks(sdk):
(exitcode, sdk_path, err) = run_command(["xcrun", "--show-sdk-path", "-sdk", sdk])
if exitcode != 0:
@@ -198,6 +210,7 @@ def collect_frameworks(sdk):
return (sorted(list(frameworks)), sdk_path)
def create_dump_module_api_args(cmd_common, cmd_extra_args, sdk, module, target, source_filename, output_dir, quiet, verbose):
# Determine the SDK root and collect the set of frameworks.
@@ -224,6 +237,7 @@ def create_dump_module_api_args(cmd_common, cmd_extra_args, sdk, module, target,
return results
def main():
source_filename = 'swift-api-dump.swift'
parser = create_parser()