Merge pull request swiftlang#8498 from practicalswift/gardening-20170403

[gardening] Fix typos. Fix headers. Python cleanups.

Author: practicalswift

.flake8

@@ -19,8 +19,7 @@ filename = *.py,
            ./utils/line-directive,
            ./utils/swift_build_support/tests/mock-distcc,
            ./docs/scripts/ns-html2rst,
-           .utils/PathSanitizingFileCheck,
-           ./utils/python-lint,
+           ./utils/PathSanitizingFileCheck,
            ./utils/recursive-lipo,
            ./utils/round-trip-syntax-test,
            ./utils/rth,
@@ -29,4 +28,4 @@ filename = *.py,
            ./utils/submit-benchmark-results,
            ./utils/update-checkout,
            ./utils/viewcfg,
-           ./utils/symbolicate-linux-fatal
+           ./utils/symbolicate-linux-fatal,

benchmark/scripts/Benchmark_RuntimeLeaksRunner.in

@@ -94,7 +94,7 @@ class LeaksRunnerBenchmarkDriver(perf_test_driver.BenchmarkDriver):
                 raise RuntimeError("Expected one line of output")
             if result != 0:
                 raise RuntimeError("Process segfaulted")
-        except:
+        except Exception:
             sys.stderr.write("Child Process Failed! (%s,%s)\n" % (
                 data['path'], data['test_name']))
             sys.stderr.flush()
@@ -110,7 +110,7 @@ class LeaksRunnerBenchmarkDriver(perf_test_driver.BenchmarkDriver):
 
             total_count = d['objc_count'] + d['swift_count']
             return total_count
-        except:
+        except Exception:
             tmp = (data['path'], data['test_name'])
             sys.stderr.write("Failed parse output! (%s,%s)\n" % tmp)
             sys.stderr.flush()

benchmark/single-source/CString.swift

@@ -1,4 +1,4 @@
-//===--- CString.swift -------------------------------------------------===//
+//===--- CString.swift ----------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //

benchmark/single-source/StringEdits.swift

@@ -1,4 +1,4 @@
-//===--- StringEdits.swift-------------------------------------------------===//
+//===--- StringEdits.swift ------------------------------------*- swift -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

benchmark/single-source/StringMatch.swift

@@ -1,4 +1,4 @@
-//===--- StringMatch.swift-------------------------------------------------===//
+//===--- StringMatch.swift ------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //

benchmark/single-source/Suffix.swift

@@ -1,4 +1,4 @@
-//===--- Suffix.swift ---------------------------------------------------===//
+//===--- Suffix.swift -----------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //

include/swift/Demangling/StandardTypesMangling.def

@@ -1,4 +1,4 @@
-//===-- StandardTypesMangling.def - Mangling Metaprogramming ----*- C++ -*-===//
+//===--- StandardTypesMangling.def - Mangling Metaprogramming ---*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

include/swift/SIL/SILVTableVisitor.h

@@ -1,4 +1,4 @@
-//===--- SILVTableVisitor.h - Class vtable visitor -------------*- C++ -*-===//
+//===--- SILVTableVisitor.h - Class vtable visitor --------------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

include/swift/TBDGen/TBDGen.h

@@ -1,4 +1,4 @@
-//===--- TBDGenPublic.h - Public interface to TBDGen ------------*- C++ -*-===//
+//===--- TBDGen.h - Public interface to TBDGen ------------------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

lib/AST/ModuleLoader.cpp

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2017 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information

lib/FrontendTool/TBD.h

@@ -1,4 +1,4 @@
-//===--- Tbd.h -- generates and validates TBD files -----------------------===//
+//===--- TBD.h -- generates and validates TBD files -------------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

lib/SILGen/ArgumentScope.h

@@ -1,4 +1,4 @@
-//===--- ArgumentScope.h --------------------------------------------------===//
+//===--- ArgumentScope.h ----------------------------------------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

lib/SILGen/Callee.h

@@ -1,4 +1,4 @@
-//===--- Callee.h ---------------------------------------------------------===//
+//===--- Callee.h -----------------------------------------------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

lib/SILGen/ResultPlan.h

@@ -1,4 +1,4 @@
-//===--- ResultPlan.h -----------------------------------------------------===//
+//===--- ResultPlan.h -------------------------------------------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

lib/SILOptimizer/Transforms/ArrayElementValuePropagation.cpp

@@ -82,7 +82,7 @@ class ArrayAllocation {
     SILValue Replacement;
   };
 
-  /// Specifies the set of elements with which a append-contentof call can be
+  /// Specifies the set of elements with which an append-contentof call can be
   /// replaced.
   struct AppendContentOfReplacement {
     ApplyInst *AppendContentOfCall;

stdlib/public/SwiftShims/CFCharacterSetShims.h

@@ -1,4 +1,4 @@
-//===--- CFCharacterSetShims.h - CoreFoundation declarations for CF hashing functions ------===//
+//===--- CFCharacterSetShims.h - Declarations for CF hashing functions ----===//
 //
 // This source file is part of the Swift.org open source project
 //

stdlib/public/SwiftShims/CFHashingShims.h

@@ -1,4 +1,4 @@
-//===--- CFHashingShims.h - CoreFoundation declarations for CF hashing functions ------===//
+//===--- CFHashingShims.h - Declarations for CF hashing functions ---------===//
 //
 // This source file is part of the Swift.org open source project
 //

stdlib/public/SwiftShims/CoreFoundationOverlayShims.h

@@ -1,4 +1,4 @@
-//===----------------------------------------------------------------------===//
+//===------------------------------------------------------------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

stdlib/public/SwiftShims/FoundationShimSupport.h

@@ -1,4 +1,4 @@
-//===--- FoundationShimSupport.h - Helper macros for Foundation overlay ------===//
+//===--- FoundationShimSupport.h - Helper macros for Foundation overlay ---===//
 //
 // This source file is part of the Swift.org open source project
 //

stdlib/public/SwiftShims/NSCalendarShims.h

@@ -1,4 +1,4 @@
-//===--- NSCalendarShims.h - Foundation declarations for Calendar overlay ------===//
+//===--- NSCalendarShims.h - Foundation declarations for Calendar overlay -===//
 //
 // This source file is part of the Swift.org open source project
 //

stdlib/public/SwiftShims/NSCoderShims.h

@@ -1,4 +1,4 @@
-//===--- NSCoderShims.h - Foundation declarations for NSCoder overlay ------===//
+//===--- NSCoderShims.h - Foundation declarations for NSCoder overlay -----===//
 //
 // This source file is part of the Swift.org open source project
 //

stdlib/public/SwiftShims/NSDataShims.h

@@ -1,4 +1,4 @@
-//===--- NSDataShims.h - Foundation declarations for Data overlay ------===//
+//===--- NSDataShims.h - Foundation declarations for Data overlay ---------===//
 //
 // This source file is part of the Swift.org open source project
 //

stdlib/public/SwiftShims/NSDictionaryShims.h

@@ -1,4 +1,4 @@
-//===--- NSDictionaryShims.h - Foundation declarations for Dictionary overlay ------===//
+//===--- NSDictionaryShims.h - Foundation decl. for Dictionary overlay ----===//
 //
 // This source file is part of the Swift.org open source project
 //

stdlib/public/SwiftShims/NSErrorShims.h

@@ -1,4 +1,4 @@
-//===--- NSErrorShims.h - Foundation declarations for NSError overlay ------===//
+//===--- NSErrorShims.h - Foundation declarations for NSError overlay -----===//
 //
 // This source file is part of the Swift.org open source project
 //

stdlib/public/SwiftShims/NSFileManagerShims.h

@@ -1,4 +1,4 @@
-//===--- NSFileManagerShims.h - Foundation declarations for FileManager overlay ------===//
+//===--- NSFileManagerShims.h - Foundation decl. for FileManager overlay --===//
 //
 // This source file is part of the Swift.org open source project
 //

stdlib/public/SwiftShims/NSIndexSetShims.h

@@ -1,4 +1,4 @@
-//===--- NSIndexSetShims.h - Foundation declarations for IndexSet overlay ------===//
+//===--- NSIndexSetShims.h - Foundation declarations for IndexSet overlay -===//
 //
 // This source file is part of the Swift.org open source project
 //

stdlib/public/SwiftShims/NSKeyedArchiverShims.h

@@ -1,4 +1,4 @@
-//===--- NSKeyedArchiverShims.h - Foundation declarations for NSKeyedArchiver overlay ------===//
+//===--- NSKeyedArchiverShims.h - Found. decl. for NSKeyedArchiver overlay ===//
 //
 // This source file is part of the Swift.org open source project
 //

stdlib/public/SwiftShims/NSLocaleShims.h

@@ -1,4 +1,4 @@
-//===--- NSLocaleShims.h - Foundation declarations for Locale overlay ------===//
+//===--- NSLocaleShims.h - Foundation declarations for Locale overlay -----===//
 //
 // This source file is part of the Swift.org open source project
 //

stdlib/public/SwiftShims/NSTimeZoneShims.h

@@ -1,4 +1,4 @@
-//===--- NSTimeZoneShims.h - Foundation declarations for TimeZone overlay ------===//
+//===--- NSTimeZoneShims.h - Foundation declarations for TimeZone overlay -===//
 //
 // This source file is part of the Swift.org open source project
 //

stdlib/public/SwiftShims/NSUndoManagerShims.h

@@ -1,4 +1,4 @@
-//===--- NSUndoManagerShims.h - Foundation declarations for NSUndoManager overlay ------===//
+//===--- NSUndoManagerShims.h - Foundation decl. for NSUndoManager overlay ===//
 //
 // This source file is part of the Swift.org open source project
 //

test/SILOptimizer/capture_promotion_generic_context_ownership.sil

@@ -78,7 +78,7 @@ struct R<T> {
 }
 
 // Check that the capture promotion took place and the function now
-// take argument of a type  E<(R<T>) -> Builtin.Int32>, which used
+// take argument of a type E<(R<T>) -> Builtin.Int32>, which used
 // to be a slot inside a box.
 // CHECK-LABEL: sil @_T023generic_promotable_box2Tf2nni_n : $@convention(thin) <T> (@in R<T>, @in Builtin.Int32, @owned E<(R<T>) -> Builtin.Int32>) -> () 
 // CHECK:       bb0([[ARG0:%.*]] : @trivial $*R<T>, [[ARG1:%.*]] : @trivial $*Builtin.Int32, [[ARG2:%.*]] : @owned $E<(R<T>) -> Builtin.Int32>):

utils/update_checkout.py

@@ -430,7 +430,7 @@ def main():
     if args.reset_to_remote and not args.scheme:
         print("update-checkout usage error: --reset-to-remote must specify "
               "--scheme=foo")
-        exit(1)
+        sys.exit(1)
 
     clone = args.clone
     clone_with_ssh = args.clone_with_ssh

validation-test/compiler_crashers/28726-nominaltypedecl-hasfixedlayout.swift

@@ -1,5 +1,5 @@
 // This source file is part of the Swift.org open source project
-// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information