Issue #25677: Merge SyntaxError caret positioning from 3.6

author Martin Panter <vadmium+py@gmail.com>

Mon, 19 Dec 2016 06:46:12 +0000 (06:46 +0000)

committer Martin Panter <vadmium+py@gmail.com>

Mon, 19 Dec 2016 06:46:12 +0000 (06:46 +0000)
author Martin Panter <vadmium+py@gmail.com>
Mon, 19 Dec 2016 06:46:12 +0000 (06:46 +0000)
committer Martin Panter <vadmium+py@gmail.com>
Mon, 19 Dec 2016 06:46:12 +0000 (06:46 +0000)
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
diff --cc Python/errors.c
Simple merge
diff --cc Python/pythonrun.c
Simple merge
author	Martin Panter <vadmium+py@gmail.com>
	Mon, 19 Dec 2016 06:46:12 +0000 (06:46 +0000)
committer	Martin Panter <vadmium+py@gmail.com>
	Mon, 19 Dec 2016 06:46:12 +0000 (06:46 +0000)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Python/errors.c	patch \|	diff1 \|	diff2 \|	blob \| history
Python/pythonrun.c	patch \|	diff1 \|	diff2 \|	blob \| history