summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Serwy <roger.serwy@gmail.com>2013-03-31 01:11:26 -0500
committerRoger Serwy <roger.serwy@gmail.com>2013-03-31 01:11:26 -0500
commit3aaf5dab8a6be48adb69290385017777b7177adf (patch)
tree2b1106e2777bae1a9351e311106c30db39518b84
parent42a83201a0eb99abd780f676055788ab0d28df50 (diff)
parent71c9e1a5c36cfc53ff760e6c3b4d957424d73d72 (diff)
downloadcpython-git-3aaf5dab8a6be48adb69290385017777b7177adf.tar.gz
#6649: merge with 3.3.
-rw-r--r--Lib/idlelib/rpc.py2
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py
index c86c97531e..9c51b8f6b5 100644
--- a/Lib/idlelib/rpc.py
+++ b/Lib/idlelib/rpc.py
@@ -145,7 +145,7 @@ class SocketIO(object):
def exithook(self):
"override for specific exit action"
- os._exit()
+ os._exit(0)
def debug(self, *args):
if not self.debugging:
diff --git a/Misc/NEWS b/Misc/NEWS
index b5ea6c8ba6..03b3c4f427 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -297,6 +297,8 @@ Core and Builtins
Library
-------
+- Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo.
+
- Issue #17435: threading.Timer's __init__ method no longer uses mutable
default values for the args and kwargs parameters.