Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

test/Incremental/Verifier/gen-output-file-map.py

@@ -9,6 +9,13 @@
 import sys
 
 
+# Python 2 `unicode` was renamed `str` in Python 3.  To consistently support
+# both, define `unicode` to be `str` when using Python 3.  Once we can drop
+# Python 2 support, delete this and change all uses of `unicode` to `str`.
+if sys.version_info[0] >= 3:
+    unicode = str
+
+
 def fatal(msg):
     print(msg, file=sys.stderr)
     sys.exit(1)
@@ -62,21 +69,14 @@ def main(arguments):
         'swift-dependencies': './main-buildrecord.swiftdeps'
     }
 
-    # TODO: this is for python 2 and python 3 compatibility.  Once Python 2 is
-    # removed, this function can be removed.
-    def to_unicode(r):
-        if sys.version_info[0] < 3:
-            return unicode(r)
-        return str(r)
-
     with io.open(output_path, 'w', encoding='utf-8', newline='\n') as f:
-        f.write(to_unicode(json.dumps(all_records, ensure_ascii=False)))
+        f.write(unicode(json.dumps(all_records, ensure_ascii=False)))
 
     if args.response_output_file is not None:
         with io.open(args.response_output_file, 'w',
                      encoding='utf-8', newline='\n') as f:
             for line in response_file_contents:
-                f.write(to_unicode(line + " "))
+                f.write(unicode(line + " "))
 
 
 if __name__ == '__main__':

utils/round-trip-syntax-test

@@ -14,6 +14,15 @@ from functools import reduce
 logging.basicConfig(format='%(message)s', level=logging.INFO)
 
 
+# Python 2 `unicode` was renamed `str` in Python 3.  To consistently support
+# both, define `unicode` to be `str` when using Python 3.  Once we can drop
+# Python 2 support, delete this and change all uses of `unicode` to `str`.
+# (Currently, this is only here to avoid a python_lint failure from unicode
+# references below.)
+if sys.version_info[0] >= 3:
+    unicode = str
+
+
 class RoundTripTask(object):
     def __init__(self, input_filename, action, swift_syntax_test,
                  skip_bad_syntax):

utils/update_checkout/tests/test_update_worktree.py

@@ -12,9 +12,9 @@
 
 import os
 
-from scheme_mock import call_quietly
-
 from . import scheme_mock
+from .scheme_mock import call_quietly
+
 
 WORKTREE_NAME = "feature"
 

utils/update_checkout/update_checkout/update_checkout.py

@@ -166,7 +166,7 @@ def update_single_repository(pool_args):
                         result = shell.run(['git', 'rev-parse', checkout_target])
                         revision = result[0].strip()
                         shell.run(['git', 'checkout', revision], echo=True)
-                    except Exception as e:
+                    except Exception:
                         raise originalException
 
             # It's important that we checkout, fetch, and rebase, in order.