Issue #24402: Merge input() fix from 3.4 into 3.5

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

Sat, 10 Oct 2015 01:55:23 +0000 (01:55 +0000)

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

Sat, 10 Oct 2015 01:55:23 +0000 (01:55 +0000)
author Martin Panter <vadmium+py@gmail.com>
Sat, 10 Oct 2015 01:55:23 +0000 (01:55 +0000)
committer Martin Panter <vadmium+py@gmail.com>
Sat, 10 Oct 2015 01:55:23 +0000 (01:55 +0000)
diff --cc Lib/test/test_builtin.py
Simple merge
diff --cc Misc/NEWS
Simple merge
diff --cc Python/bltinmodule.c
Simple merge
author	Martin Panter <vadmium+py@gmail.com>
	Sat, 10 Oct 2015 01:55:23 +0000 (01:55 +0000)
committer	Martin Panter <vadmium+py@gmail.com>
	Sat, 10 Oct 2015 01:55:23 +0000 (01:55 +0000)
		1	2
Lib/test/test_builtin.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Python/bltinmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history