[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5

Fri Nov 20 12:22:40 EST 2015

https://hg.python.org/cpython/rev/96d1cb825c85
changeset: 99232:96d1cb825c85
parent: 99228:9e65015582a5
parent: 99231:64e1a6c99037
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Fri Nov 20 12:22:18 2015 -0500
summary:
 Merge with 3.5
files:
 Lib/idlelib/PyShell.py | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -989,7 +989,7 @@
 if self.executing:
 response = tkMessageBox.askokcancel(
 "Kill?",
- "The program is still running!\n Do you want to kill it?",
+ "Your program is still running!\n Do you want to kill it?",
 default="ok",
 parent=self.text)
 if response is False:
-- 
Repository URL: https://hg.python.org/cpython
