From: Ned Deily <nad@acm.org>
Date: Wed, 11 Dec 2013 00:32:57 +0000 (-0800)
Subject: Issue #18270: merge from 3.3
X-Git-Tag: v3.4.0b2~260
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e72b90eb7ac997e62f547d4ab56a68fe21206e87;p=thirdparty%2FPython%2Fcpython.git

Issue #18270: merge from 3.3
---

e72b90eb7ac997e62f547d4ab56a68fe21206e87
diff --cc Lib/idlelib/PyShell.py
index 176170ff8bd2,6674f4ecdda1..3c203d046337
mode 100644,100755..100755
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py