From: Georg Brandl <georg@python.org>
Date: Sun, 12 May 2013 09:24:47 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v3.3.2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=831ae8454d6acc00c110e75f7a756cbfb071fe25;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

831ae8454d6acc00c110e75f7a756cbfb071fe25
diff --cc Misc/NEWS
index c74107622a5a,c76a852f0504..a2da8e03d0da
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -147,10 -118,8 +147,12 @@@ Librar
  IDLE
  ----
  
+ - Issue #17838: Allow sys.stdin to be reassigned.
+ 
 +- Issue #13495: Avoid loading the color delegator twice in IDLE.
 +
 +- Issue #17798: Allow IDLE to edit new files when specified on command line.
 +
  - Issue #14735: Update IDLE docs to omit "Control-z on Windows".
  
  - Issue #17585: Fixed IDLE regression. Now closes when using exit() or quit().