#17585: merge with 3.3.

diff --cc Lib/idlelib/PyShell.py
Simple merge

diff --cc Lib/site.py
Simple merge

diff --cc Misc/NEWS
index 7be4c6d02910345eeb585c09f722f94690f9c175,ddfc7011983bb0ecf6e334d65fce1dd765f4e9b4..d3c9c262592e7c84c700ad13c119afc2b2a3bbef
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -1057,69 -792,6 +1057,71 @@@ _ Issue #17385: Fix quadratic behavior 
  - Issue #12268: The io module file object write methods no longer abort early
    when one of its write system calls is interrupted (EINTR).
  
 +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.
 +
 +- Issue #17613: Prevent traceback when removing syntax colorizer in IDLE.
 +
 +- Issue #1207589: Backwards-compatibility patch for right-click menu in IDLE.
 +
 +- Issue #16887: IDLE now accepts Cancel in tabify/untabify dialog box.
 +
 +- Issue #14254: IDLE now handles readline correctly across shell restarts.
 +
 +- Issue #17614: IDLE no longer raises exception when quickly closing a file.
 +
 +- Issue #6698: IDLE now opens just an editor window when configured to do so.
 +
 +- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer
 +  raises an exception.
 +
 +- Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo.
 +
 +- Issue #17625: In IDLE, close the replace dialog after it is used.
 +
 +- Issue #16123: IDLE - deprecate running without a subprocess.
 +  Patch by Roger Serwy.
 +
 +- Issue #1207589: Add Cut/Copy/Paste items to IDLE right click Context Menu
 +  Patch by Todd Rovito.
 +
 +- Issue #16511: Use default IDLE width and height if config param is not valid.
 +  Patch Serhiy Storchaka.
 +
 +- Issue #16504: IDLE now catches SyntaxErrors raised by tokenizer. Patch by
 +  Roger Serwy.
 +
 +- Issue #16819: IDLE method completion now correctly works for bytes literals.
 +
 +- Issue #16491: IDLE now prints chained exception tracebacks.
 +
 +- Issue #16829: IDLE printing no longer fails if there are spaces or other
 +  special characters in the file path.
 +
 +- Issue #5066: Update IDLE docs. Patch by Todd Rovito.
 +
 +- Issue #9290: In IDLE the sys.std* streams now implement io.TextIOBase
 +  interface and support all mandatory methods and properties.
 +
 +- Issue #17114: IDLE now uses non-strict config parser.
 +
 +- Issue #14254: IDLE now handles readline correctly across shell restarts.
 +
 +- Issue #17614: IDLE no longer raises exception when quickly closing a file.
 +
 +- Issue #6698: IDLE now opens just an editor window when configured to do so.
 +
 +- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer
 +  raises an exception.
 +
 +- Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo.
 +
 +
  Tests
  -----