Merge pull request swiftlang#920 from practicalswift/gyb-fixes

[gardening] Clean up .gyb-files: Remove unused imports. Non-controversial PEP8 fixes.

Author: moiseev

lib/Basic/UnicodeExtendedGraphemeClusters.cpp.gyb

@@ -17,9 +17,7 @@
 
 %{
 
-import re
-
-from GYBUnicodeDataUtils import *
+from GYBUnicodeDataUtils import GraphemeClusterBreakPropertyTable, get_extended_grapheme_cluster_rules_matrix
 
 grapheme_cluster_break_property_table = \
     GraphemeClusterBreakPropertyTable(unicodeGraphemeBreakPropertyFile)

lib/ClangImporter/SortedCFDatabase.def.gyb

@@ -39,7 +39,7 @@ with codecs.open(CFDatabaseFile, encoding='utf-8', errors='strict') as f:
       continue
 
     # Otherwise, check for lines like FOO(BAR)
-    m = re.match('^\w+\((\w+)\)', line)   
+    m = re.match('^\w+\((\w+)\)', line)
     if m:
       lineForName[m.group(1)] = line
 }%

stdlib/public/SDK/CoreGraphics/CGFloat.swift.gyb

@@ -12,7 +12,7 @@
 
 %{
 
-from SwiftIntTypes import *
+from SwiftIntTypes import all_integer_types
 
 # Number of bits in the Builtin.Word type
 word_bits = int(CMAKE_SIZEOF_VOID_P) * 8

stdlib/public/SDK/CoreGraphics/CoreGraphicsMirrors.swift.gyb

@@ -15,8 +15,8 @@
 %TMirrorConformance = gyb.parseTemplate("../../common/MirrorConformance.gyb")
 %TMirrorBoilerplate = gyb.parseTemplate("../../common/MirrorBoilerplate.gyb")
 
-% for Type in [['CGPoint',['x','y'],'Point',['x','y']],\
-%             ['CGSize',['width','height'],'Size',['width','height']],\
+% for Type in [['CGPoint',['x','y'],'Point',['x','y']],
+%             ['CGSize',['width','height'],'Size',['width','height']],
 %             ['CGRect',['origin','size'],'Rectangle',['origin.x','origin.y','size.width','size.height']]]:
 %   Self = Type[0]
 %   Children = Type[1]
@@ -25,11 +25,11 @@
 %   MirrorDecl = gyb.executeTemplate(TMirrorDecl,introspecteeType=Self,disposition='Struct')
 %   MirrorConformance = gyb.executeTemplate(TMirrorConformance,introspecteeType=Self,disposition='Struct')
 %   MirrorBoilerplate = gyb.executeTemplate(TMirrorBoilerplate,introspecteeType=Self,disposition='Struct')
-%   QLArgFirst=True
+%   QLArgFirst = True
 %   QLArgString = ''
 %   SummaryString = ''
 %   for QLArg in QLArgs:
-%     if QLArgFirst == False:
+%     if not QLArgFirst:
 %       QLArgString = QLArgString + ', '
 %       SummaryString = SummaryString + ', '
 %     else:

stdlib/public/SDK/Foundation/FoundationMirrors.swift.gyb

@@ -19,16 +19,16 @@
 // probably not worth trying to write one unique generator - let's
 // just use these helpers manually and write the bulk of each one
 %{
-def getMirrorConformance(Self,Disp = None):
+def getMirrorConformance(Self, Disp=None):
   return gyb.executeTemplate(
-    TMirrorConformance,introspecteeType=Self,disposition=Disp)
+    TMirrorConformance, introspecteeType=Self, disposition=Disp)
 
-def getMirrorBoilerplate(Self,Disp = None):
+def getMirrorBoilerplate(Self, Disp=None):
   return gyb.executeTemplate(
-    TMirrorBoilerplate,introspecteeType=Self,disposition=Disp)
+    TMirrorBoilerplate, introspecteeType=Self, disposition=Disp)
 
-def getMirrorDecl(Self,Disp = None):
-  return gyb.executeTemplate(TMirrorDecl,introspecteeType=Self,disposition=Disp)
+def getMirrorDecl(Self, Disp=None):
+  return gyb.executeTemplate(TMirrorDecl, introspecteeType=Self, disposition=Disp)
 }%
 
 // actual Mirrors

stdlib/public/SDK/simd/simd.swift.gyb

@@ -30,7 +30,7 @@ import Darwin
 //    Workaround <rdar://problem/18900352>
 %     vectype = ctype[type] + str(size)
 %     llvm_vectype = "Vec" + str(size) + "x" + llvm_type[type]
-%     vecsize = (8 if type == 'Double' else 4)*(2 if size == 2 else 4)
+%     vecsize = (8 if type == 'Double' else 4) * (2 if size == 2 else 4)
 %     extractelement = "extractelement_" + llvm_vectype + "_Int32"
 %     insertelement = "insertelement_" + llvm_vectype + "_" + llvm_type[type] + "_Int32"
 %     is_floating = type in floating_types

stdlib/public/common/MirrorBoilerplate.gyb

@@ -25,7 +25,9 @@
 # this template, which is probably reasonable since those are "the meat" of every Mirror
 }%
 
-%import inspect,os.path,sys
+%import inspect
+%import os.path
+%import sys
 %sys.path = [os.path.split(inspect.getframeinfo(inspect.currentframe()).filename)[0] or '.'] + sys.path
 %import MirrorCommon
 %genericArgString = MirrorCommon.getGenericArgString(

stdlib/public/common/MirrorDecl.gyb

@@ -25,11 +25,13 @@
 # this template, which is probably reasonable since those are "the meat" of every Mirror
 }%
 
-%import inspect,os.path,sys
+%import inspect
+%import os.path
+%import sys
 %sys.path = [os.path.split(inspect.getframeinfo(inspect.currentframe()).filename)[0] or '.'] + sys.path
 %import MirrorCommon
-%genericConstraintString = MirrorCommon.getGenericConstraintString(\
-%                          genericArgs if 'genericArgs' in locals() else None,\
-%                          genericConstraints if 'genericConstraints' in locals() else None)
+%genericConstraintString = MirrorCommon.getGenericConstraintString(
+%    genericArgs if 'genericArgs' in locals() else None,
+%    genericConstraints if 'genericConstraints' in locals() else None)
 
 internal struct _${introspecteeType}Mirror${genericConstraintString} : _MirrorType

stdlib/public/core/CollectionMirrors.swift.gyb

@@ -15,24 +15,24 @@
 %TMirrorConformance = gyb.parseTemplate("../common/MirrorConformance.gyb")
 %TMirrorBoilerplate = gyb.parseTemplate("../common/MirrorBoilerplate.gyb")
 
-% for Type in [['CollectionOfOne',1,"element",\
-%               'CollectionOfOne(\( _reflect(_value.element).summary ))'],\
+% for Type in [['CollectionOfOne',1,"element",
+%               'CollectionOfOne(\( _reflect(_value.element).summary ))'],
 %             ['EmptyCollection',0,"DONTSHOWME",'EmptyCollection']]:
 %   Self = Type[0]
 %   Count = Type[1]
 %   ElementName = Type[2]
 %   SummaryString = Type[3]
-%   MirrorDecl = gyb.executeTemplate(TMirrorDecl,\
-%                                    introspecteeType=Self,\
-%                                    genericArgs=['T'],\
+%   MirrorDecl = gyb.executeTemplate(TMirrorDecl,
+%                                    introspecteeType=Self,
+%                                    genericArgs=['T'],
 %                                    disposition='Struct')
-%   MirrorConformance = gyb.executeTemplate(TMirrorConformance,\
-%                                    introspecteeType=Self,\
-%                                    genericArgs=['T'],\
+%   MirrorConformance = gyb.executeTemplate(TMirrorConformance,
+%                                    introspecteeType=Self,
+%                                    genericArgs=['T'],
 %                                    disposition='Struct')
-%   MirrorBoilerplate = gyb.executeTemplate(TMirrorBoilerplate,\
-%                                    introspecteeType=Self,\
-%                                    genericArgs=['T'],\
+%   MirrorBoilerplate = gyb.executeTemplate(TMirrorBoilerplate,
+%                                    introspecteeType=Self,
+%                                    genericArgs=['T'],
 %                                    disposition='Struct')
 
 ${MirrorDecl} {

stdlib/public/core/FixedPoint.swift.gyb

@@ -12,7 +12,7 @@
 
 %{
 
-from SwiftIntTypes import *
+from SwiftIntTypes import all_integer_types, int_max_bits, should_define_truncating_bit_pattern_init
 
 #
 # Utility code for later in this template

stdlib/public/core/FloatingPointOperations.swift.gyb

@@ -12,7 +12,7 @@
 
 %{
 
-from SwiftIntTypes import *
+from SwiftIntTypes import all_integer_types
 
 # Number of bits in the Builtin.Word type
 word_bits = int(CMAKE_SIZEOF_VOID_P) * 8

stdlib/public/core/IntegerParsing.swift.gyb

@@ -12,7 +12,7 @@
 
 %{
 
-from SwiftIntTypes import *
+from SwiftIntTypes import all_integer_types, int_max_bits
 
 # Number of bits in the Builtin.Word type
 word_bits = int(CMAKE_SIZEOF_VOID_P) * 8

stdlib/public/core/Interval.swift.gyb

@@ -204,8 +204,8 @@ public func ~= <I: IntervalType>(pattern: I, value: I.Bound) -> Bool {
 %import gyb
 %TBoilerplate = gyb.parseTemplate("../common/MirrorBoilerplate.gyb")
 
-%Boilerplate = gyb.executeTemplate(TBoilerplate,\
-%                                  introspecteeType='T',\
+%Boilerplate = gyb.executeTemplate(TBoilerplate,
+%                                  introspecteeType='T',
 %                                  disposition='Struct')
 
 internal struct _IntervalMirror<

stdlib/public/core/Mirrors.swift.gyb

@@ -12,7 +12,7 @@
 
 %{
 
-from SwiftIntTypes import *
+from SwiftIntTypes import all_integer_types
 
 # Number of bits in the Builtin.Word type
 word_bits = int(CMAKE_SIZEOF_VOID_P) * 8

stdlib/public/core/Slice.swift.gyb

@@ -36,7 +36,7 @@ def get_slice_doc_comment(Self):
 ///   the slice may prolong the lifetime of elements that are no longer
 ///   accessible, which can manifest as apparent memory and object leakage.  To
 ///   prevent this effect, use slices only for transient computation.\
-"""  % (Self, Self, Self, Self, Self)
+""" % (Self, Self, Self, Self, Self)
 }%
 
 ${get_slice_doc_comment('Slice')}

stdlib/public/core/Sort.swift.gyb

@@ -11,11 +11,11 @@
 //===----------------------------------------------------------------------===//
 
 %{
-def cmp(a,b,p):
+def cmp(a, b, p):
   if p:
-    return "isOrderedBefore("+a+", "+b+")"
+    return "isOrderedBefore(" + a + ", " + b + ")"
   else:
-    return "("+a+" < "+b+")"
+    return "(" + a + " < " + b + ")"
 
 }%
 

stdlib/public/core/StringInterpolation.swift.gyb

@@ -12,7 +12,7 @@
 
 %{
 
-from SwiftIntTypes import *
+from SwiftIntTypes import all_integer_types
 
 # Number of bits in the Builtin.Word type
 word_bits = int(CMAKE_SIZEOF_VOID_P) * 8

stdlib/public/core/Tuple.swift.gyb

@@ -13,7 +13,7 @@
 // Generate comparison functions for tuples up to some reasonable arity.
 
 % for arity in range(2,7):
-%   typeParams = [chr(ord("A")+i) for i in range(arity)]
+%   typeParams = [chr(ord("A") + i) for i in range(arity)]
 %   tupleT = "({})".format(",".join(typeParams))
 
 %   equatableTypeParams = ", ".join(["{} : Equatable".format(c) for c in typeParams])

stdlib/public/stubs/UnicodeExtendedGraphemeClusters.cpp.gyb

@@ -15,7 +15,7 @@
 # FIXME: this table should be moved to a Swift file in stdlib.  Unfortunately,
 # in Swift we don't have a way to statically initialize arrays.
 
-from GYBUnicodeDataUtils import *
+from GYBUnicodeDataUtils import GraphemeClusterBreakPropertyTable, UnicodeTrieGenerator, get_extended_grapheme_cluster_rules_matrix
 
 grapheme_cluster_break_property_table = \
     GraphemeClusterBreakPropertyTable(unicodeGraphemeBreakPropertyFile)

test/1_stdlib/Inputs/flatMap.gyb

@@ -1,4 +1,6 @@
-%import inspect,os.path,sys
+%import inspect
+%import os.path
+%import sys
 %sys.path = [os.path.split(inspect.getframeinfo(inspect.currentframe()).filename)[0] or '.'] + sys.path
 
 % for Kind in Kinds:

test/1_stdlib/NumericParsing.swift.gyb

@@ -16,20 +16,22 @@
 // RUN: %S/../../utils/line-directive %t/NumericParsing.swift -- %target-run %t/a.out
 // REQUIRES: executable_test
 %{
-from SwiftIntTypes import *
+from SwiftIntTypes import all_integer_types
 
 word_bits = int(CMAKE_SIZEOF_VOID_P)
 
 def maskOfWidth(n):
   return (1 << n) - 1
 
-def inRadix(radix, n, zero = '0'):
+def inRadix(radix, n, zero='0'):
   """
 Represent the int n in the given radix.  
 Note: the third parameter, zero, is not for user consumption.
   """
-  if n < 0: return '-' + inRadix(radix, -n, '')
-  elif n == 0: return zero
+  if n < 0:
+    return '-' + inRadix(radix, -n, '')
+  elif n == 0:
+    return zero
   else:
     r = n % radix
     digit = chr((ord('0') + r) if r < 10 else (ord('a') + r - 10))
@@ -43,7 +45,7 @@ radices_to_test = [2, 8, 10, 16, max_radix]
 
 # How many values to test in each radix?  A nice prime number of course.
 number_of_values = 23
-}% 
+}%
 
 import StdlibUnittest
 

test/1_stdlib/Tuple.swift.gyb

@@ -68,10 +68,10 @@ TupleTestSuite.test("Tuple/equality") {
 
 TupleTestSuite.test("Tuple/equality/sanity-check") {
   // sanity check all arities
-% for arity in range(2,maxArity+1):
+% for arity in range(2, maxArity+1):
 %   a = str(tuple(range(1, arity+1)))
-%   b = "({}, 0)".format(", ".join([str(i) for i in range(1,arity)]))
-%   c = "(0, {})".format(", ".join([str(i) for i in range(2,arity+1)]))
+%   b = "({}, 0)".format(", ".join([str(i) for i in range(1, arity)]))
+%   c = "(0, {})".format(", ".join([str(i) for i in range(2, arity+1)]))
   expectTrue(${a} == ${a})
   expectTrue(${a} != ${b})
   expectTrue(${b} != ${a})
@@ -147,10 +147,10 @@ TupleTestSuite.test("Tuple/comparison") {
 
 TupleTestSuite.test("Tuple/comparison/sanity-check") {
   // sanity check all arities
-% for arity in range(2,maxArity+1):
+% for arity in range(2, maxArity+1):
 %   a = str(tuple(range(1, arity+1)))
-%   b = "({}, 0)".format(", ".join([str(i) for i in range(1,arity)]))
-%   c = "(0, {})".format(", ".join([str(i) for i in range(2,arity+1)]))
+%   b = "({}, 0)".format(", ".join([str(i) for i in range(1, arity)]))
+%   c = "(0, {})".format(", ".join([str(i) for i in range(2, arity+1)]))
   expectTrue(${b} < ${a})
   expectTrue(${b} <= ${a})
   expectTrue(${a} > ${c})

unittests/Basic/UnicodeGraphemeBreakTest.cpp.gyb

@@ -17,7 +17,7 @@
 
 %{
 
-from GYBUnicodeDataUtils import *
+from GYBUnicodeDataUtils import get_grapheme_cluster_break_tests_as_UTF8
 
 grapheme_cluster_break_tests = \
     get_grapheme_cluster_break_tests_as_UTF8(unicodeGraphemeBreakTestFile)

validation-test/stdlib/FixedPoint.swift.gyb

@@ -78,7 +78,7 @@ def get_fixed_point_hash(bit_pattern, src_bits, word_bits):
 
 truncating_bit_pattern_test_template = gyb.parseTemplate("truncating_bit_pattern",
 """
-% from SwiftIntTypes import *
+% from SwiftIntTypes import all_integer_types, should_define_truncating_bit_pattern_init
 
 % for dst_ty in all_integer_types(word_bits):
 %   Dst = dst_ty.stdlib_name
@@ -149,7 +149,7 @@ _UnimplementedError()
 
 bit_pattern_test_template = gyb.parseTemplate("bit_pattern",
 """
-% from SwiftIntTypes import *
+% from SwiftIntTypes import all_integer_types
 
 % for dst_ty in all_integer_types(word_bits):
 %   Dst = dst_ty.stdlib_name
@@ -225,7 +225,7 @@ _UnimplementedError()
 
 hash_value_test_template = gyb.parseTemplate("hash_value",
 """
-% from SwiftIntTypes import *
+% from SwiftIntTypes import all_integer_types
 
 % for self_ty in all_integer_types(word_bits):
 %   Self = self_ty.stdlib_name

validation-test/stdlib/FixedPointArithmeticTraps.swift.gyb

@@ -50,7 +50,7 @@ func expectNoOverflow<T>(
 
 %{
 
-from SwiftIntTypes import *
+from SwiftIntTypes import all_integer_types
 
 # Test cases are written in a way that they don't depend on the word size.
 word_bits = 4

validation-test/stdlib/FloatingPointConversionTraps.swift.gyb

@@ -20,7 +20,7 @@ import ObjectiveC
 
 %{
 
-from SwiftIntTypes import *
+from SwiftIntTypes import all_integer_types
 
 # Test cases are written in a way that they don't depend on the word size.
 word_bits = 4

validation-test/stdlib/NumericDiagnostics.swift.gyb

@@ -15,7 +15,7 @@
 // TODO: Verify the type of the result
 
 func testIteratedOperations() {
-% for typesToTest, operatorsToTest in zip([all_integer_type_names(), all_numeric_type_names()], \
+% for typesToTest, operatorsToTest in zip([all_integer_type_names(), all_numeric_type_names()],
 %  [int_ops, arith_ops]):
   % operatorsToTest = [x for x in operatorsToTest if not '+' in x and not '-' in x] 
   %# TODO: rm when rdar://18695154 is fixed.

validation-test/stdlib/Slice/Inputs/slice.gyb

@@ -1,4 +1,6 @@
-%import inspect,os.path,sys
+%import inspect
+%import os.path
+%import sys
 %sys.path = [os.path.split(inspect.getframeinfo(inspect.currentframe()).filename)[0] or '.'] + sys.path
 
 % Base = "%s%s%sCollection" % (base_kind, traversal, 'Mutable' if mutable else '')