This is an archive of the discontinued LLVM Phabricator instance.

Make clang-format-diff compatible with Python 3.4
ClosedPublic

Authored by swaroop.sridhar on Feb 23 2015, 3:41 PM.

Reviewers

djasper
doug.gregor

Summary

Update the clang-format-diff.py script is updated so that it works with Python 2.7 as well as Python 3.x series.

swaroop.sridhar retitled this revision from to Make clang-format-diff compatible with Python 3.4.

swaroop.sridhar updated this object.

swaroop.sridhar edited the test plan for this revision. (Show Details)

swaroop.sridhar added a subscriber: Unknown Object (MLST).Feb 23 2015, 3:43 PM

I think @djasper could help with this review.

Looks good.

This revision is now accepted and ready to land.Oct 13 2016, 6:07 AM

This patch needs rebasing.

Closing this does not look relevant anymore

Path

Size

tools/

clang-format/

12 lines

Context not available.
	import re	import re
	import string	import string
	import subprocess	import subprocess
	import StringIO	import io
	import sys	import sys


Context not available.
	['-lines', str(start_line) + ':' + str(end_line)])	['-lines', str(start_line) + ':' + str(end_line)])

	# Reformat files containing changes in place.	# Reformat files containing changes in place.
	for filename, lines in lines_by_file.iteritems():	for filename, lines in lines_by_file.items():
	if args.i and args.verbose:	if args.i and args.verbose:
	print 'Formatting', filename	print ('Formatting', filename)
	command = [binary, filename]	command = [binary, filename]
	if args.i:	if args.i:
	command.append('-i')	command.append('-i')
Context not available.
	if not args.i:	if not args.i:
	with open(filename) as f:	with open(filename) as f:
	code = f.readlines()	code = f.readlines()
	formatted_code = StringIO.StringIO(stdout).readlines()	formatted_code = io.StringIO(stdout.decode()).readlines()
	diff = difflib.unified_diff(code, formatted_code,	diff = difflib.unified_diff(code, formatted_code,
	filename, filename,	filename, filename,
	'(before formatting)', '(after formatting)')	'(before formatting)', '(after formatting)')
	diff_string = string.join(diff, '')	sys.stdout.writelines(diff)
	if len(diff_string) > 0:
	sys.stdout.write(diff_string)

	if __name__ == '__main__':	if __name__ == '__main__':
	main()	main()
Context not available.