cpython: 82451c88b3c0 (original) (raw)

Mercurial > cpython

changeset 83260:82451c88b3c0

#17585: merge with 3.3. [#17585]

Roger Serwy roger.serwy@gmail.com
date	Thu, 11 Apr 2013 19🔞22 -0500
parents	c84a5e5f73c3(current diff)d3c67e2fc68c(diff)
children	4c73d4785829
files	Lib/idlelib/PyShell.py Lib/site.py Misc/NEWS
diffstat	3 files changed, 6 insertions(+), 6 deletions(-)[+] [-] Lib/idlelib/PyShell.py 3 Lib/site.py 7 Misc/NEWS 2

line wrap: on

line diff

--- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -1368,6 +1368,9 @@ class PseudoInputFile(PseudoFile): self._line_buffer = line[size:] return line[:size]

def close(self):
```
   self.shell.close()[](#l1.8)
```

+ usage_msg = """[](#l1.11)

--- a/Lib/site.py +++ b/Lib/site.py @@ -350,12 +350,7 @@ def setquit(): # Shells like IDLE catch the SystemExit, but listen when their # stdin wrapper is closed. try:

```
           fd = -1[](#l2.7)
```

           if hasattr(sys.stdin, "fileno"):[](#l2.8)

               fd = sys.stdin.fileno()[](#l2.9)

```
           if fd != 0:[](#l2.10)
```

               # Don't close stdin if it wraps fd 0[](#l2.11)

               sys.stdin.close()[](#l2.12)

           sys.stdin.close()[](#l2.13)
       except:[](#l2.14)
           pass[](#l2.15)
       raise SystemExit(code)[](#l2.16)

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -1060,6 +1060,8 @@ Library 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.