From 53b98a5022a2c1bfec3ac184645467620c957a5e Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Mon, 13 Jan 2020 21:43:18 +0100
Subject: [PATCH] fix_style: Add Python 3 support (see issue #2856)

---
 tools/fix_style.py | 24 +++++++++++++-----------
 tools/yapf_util.py |  6 ++++--
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/tools/fix_style.py b/tools/fix_style.py
index b610c0dc2..e0debaeff 100644
--- a/tools/fix_style.py
+++ b/tools/fix_style.py
@@ -3,6 +3,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from __future__ import absolute_import
+from __future__ import print_function
 import os, re, sys
 from clang_util import clang_format
 from file_util import eval_file, get_files, read_file, write_file
@@ -34,7 +36,7 @@ def msg(filename, status):
       filename = filename[pos:]
     filename = "..." + filename
 
-  print "%-60s %s" % (filename, status)
+  print("%-60s %s" % (filename, status))
 
 
 updatect = 0
@@ -124,15 +126,15 @@ def fix_style(filenames, white_list=None, black_list=None):
 
 if __name__ == "__main__":
   if len(sys.argv) == 1:
-    print "Usage: %s [file-path|git-hash|unstaged|staged] ..." % sys.argv[0]
-    print "\n Format C, C++ and ObjC files using Chromium's clang-format style."
-    print "\nOptions:"
-    print " file-path\tProcess the specified file or directory."
-    print " \t\tDirectories will be processed recursively."
-    print " \t\tThe \"*\" wildcard character is supported."
-    print " git-hash\tProcess all files changed in the specified Git commit."
-    print " unstaged\tProcess all unstaged files in the Git repo."
-    print " staged\t\tProcess all staged files in the Git repo."
+    print("Usage: %s [file-path|git-hash|unstaged|staged] ...\n" % sys.argv[0])
+    print(" Format C, C++ and ObjC files using Chromium's clang-format style.")
+    print("\nOptions:")
+    print(" file-path\tProcess the specified file or directory.")
+    print(" \t\tDirectories will be processed recursively.")
+    print(" \t\tThe \"*\" wildcard character is supported.")
+    print(" git-hash\tProcess all files changed in the specified Git commit.")
+    print(" unstaged\tProcess all unstaged files in the Git repo.")
+    print(" staged\t\tProcess all staged files in the Git repo.")
     sys.exit(1)
 
   # Read the configuration file.
@@ -140,4 +142,4 @@ if __name__ == "__main__":
 
   # Process anything passed on the command-line.
   fix_style(sys.argv[1:])
-  print 'Done - Wrote %d files.' % updatect
+  print('Done - Wrote %d files.' % updatect)
diff --git a/tools/yapf_util.py b/tools/yapf_util.py
index 9618a3fc6..c5add7eaf 100644
--- a/tools/yapf_util.py
+++ b/tools/yapf_util.py
@@ -2,6 +2,8 @@
 # reserved. Use of this source code is governed by a BSD-style license that
 # can be found in the LICENSE file
 
+from __future__ import absolute_import
+from __future__ import print_function
 from exec_util import exec_cmd
 import os
 import sys
@@ -14,9 +16,9 @@ root_dir = os.path.join(script_dir, os.pardir)
 def yapf_format(file_name, file_contents):
   # Reads .style.yapf in the root_dir when specifying contents via stdin.
   result = exec_cmd("%s %s/yapf" % (sys.executable, script_dir), root_dir,
-                    file_contents)
+                    file_contents.encode('utf-8'))
   if result['err'] != '':
-    print "yapf error: %s" % result['err']
+    print("yapf error: %s" % result['err'])
   if result['out'] != '':
     output = result['out']
     if sys.platform == 'win32':