Issue #18270: merge from 3.3

author Ned Deily <nad@acm.org>

Wed, 11 Dec 2013 00:32:57 +0000 (16:32 -0800)

committer Ned Deily <nad@acm.org>

Wed, 11 Dec 2013 00:32:57 +0000 (16:32 -0800)
author Ned Deily <nad@acm.org>
Wed, 11 Dec 2013 00:32:57 +0000 (16:32 -0800)
committer Ned Deily <nad@acm.org>
Wed, 11 Dec 2013 00:32:57 +0000 (16:32 -0800)
diff --cc Lib/idlelib/PyShell.py

index 176170ff8bd208166141b407ae07b9c3a8a0f659,6674f4ecdda1805d53828597134fda32eaf8c29f..3c203d04633791204f2e1ebcb0a6e23fe97cc37e

mode 100644,100755..100755
--- 1/Lib/idlelib/PyShell.py
--- 2/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
diff --cc Misc/NEWS
Simple merge
author	Ned Deily <nad@acm.org>
	Wed, 11 Dec 2013 00:32:57 +0000 (16:32 -0800)
committer	Ned Deily <nad@acm.org>
	Wed, 11 Dec 2013 00:32:57 +0000 (16:32 -0800)
		1	2
Lib/idlelib/PyShell.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history