[Python-checkins] cpython (merge 3.3 -> default): #17585: merge with 3.3.

[roger.serwy]

http://hg.python.org/cpython/rev/82451c88b3c0
changeset:   83260:82451c88b3c0
parent:      83257:c84a5e5f73c3
parent:      83259:d3c67e2fc68c
user:        Roger Serwy <roger.serwy at gmail.com>
date:        Thu Apr 11 19:18:22 2013 -0500
summary:
  #17585: merge with 3.3.

files:
  Lib/idlelib/PyShell.py |  3 +++
  Lib/site.py            |  7 +------
  Misc/NEWS              |  2 ++
  3 files changed, 6 insertions(+), 6 deletions(-)


diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -1368,6 +1368,9 @@
         self._line_buffer = line[size:]
         return line[:size]
 
+    def close(self):
+        self.shell.close()
+
 
 usage_msg = """\
 
diff --git a/Lib/site.py b/Lib/site.py
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -350,12 +350,7 @@
             # Shells like IDLE catch the SystemExit, but listen when their
             # stdin wrapper is closed.
             try:
-                fd = -1
-                if hasattr(sys.stdin, "fileno"):
-                    fd = sys.stdin.fileno()
-                if fd != 0:
-                    # Don't close stdin if it wraps fd 0
-                    sys.stdin.close()
+                sys.stdin.close()
             except:
                 pass
             raise SystemExit(code)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1060,6 +1060,8 @@
 IDLE
 ----
 
+- Issue #17585: Fixed IDLE regression. Now closes when using exit() or quit().
+
 - Issue #17657: Show full Tk version in IDLE's about dialog.
   Patch by Todd Rovito.
 

-- 
Repository URL: http://hg.python.org/cpython