Skip to content

Commit 6f86f50

Browse files
authored
Fix py3 issues with g-j-f-diff
- `StringIO` expectes `Text`, not `bytes`. - `string.join(a,b)` is replaced with `b.join(a)`
1 parent 96a8b90 commit 6f86f50

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

scripts/google-java-format-diff.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@ def main():
134134
if not args.i:
135135
with open(filename) as f:
136136
code = f.readlines()
137-
formatted_code = io.StringIO(stdout).readlines()
137+
formatted_code = io.StringIO(stdout.decode('utf-8')).readlines()
138138
diff = difflib.unified_diff(code, formatted_code,
139139
filename, filename,
140140
'(before formatting)', '(after formatting)')
141-
diff_string = string.join(diff, '')
141+
diff_string = ''.join(diff)
142142
if len(diff_string) > 0:
143143
sys.stdout.write(diff_string)
144144

0 commit comments

Comments
 (0)