Fix py3 issues with g-j-f-diff

nakulj · google-java-format Team · commit c8741147a23a · 2021-11-15T08:49:53.000-08:00
- `StringIO` expectes `Text`, not `bytes`. - `string.join(a,b)` is replaced with `b.join(a)` Fixes #682 COPYBARA_INTEGRATE_REVIEW=#682 from nakulj:patch-2 6f86f50 PiperOrigin-RevId: 409992189
diff --git a/scripts/google-java-format-diff.py b/scripts/google-java-format-diff.py
@@ -134,11 +134,11 @@ def main():
     if not args.i:
       with open(filename) as f:
         code = f.readlines()
-      formatted_code = io.StringIO(stdout).readlines()
+      formatted_code = io.StringIO(stdout.decode('utf-8')).readlines()
       diff = difflib.unified_diff(code, formatted_code,
                                   filename, filename,
                                   '(before formatting)', '(after formatting)')
-      diff_string = string.join(diff, '')
+      diff_string = ''.join(diff)
       if len(diff_string) > 0:
         sys.stdout.write(diff_string)
 
