Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix py3 issues with g-j-f-diff
- `StringIO` expectes `Text`, not `bytes`.
- `string.join(a,b)` is replaced with `b.join(a)`
  • Loading branch information
nakulj authored Nov 2, 2021
commit 6f86f50ec0650f6b0187c6451cb773e022bfea1e
4 changes: 2 additions & 2 deletions scripts/google-java-format-diff.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down