From: Éric Araujo <merwok@netwok.org>
Date: Thu, 28 Jul 2011 21:08:11 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.2.2rc1~56^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf534817adc49b2562d175fabd3e3992d25063fe;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

cf534817adc49b2562d175fabd3e3992d25063fe
diff --cc Misc/NEWS
index fd3b878da779,7da5eaab0281..fa91d17d1db3
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -41,6 -37,20 +41,15 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #12607: In subprocess, fix issue where if stdin, stdout or stderr is
+   given as a low fd, it gets overwritten.
+ 
+ - Issue #12590: IDLE editor window now always displays the first line
+   when opening a long file.  With Tk 8.5, the first line was hidden.
+ 
+ - Issue #12576: Fix urlopen behavior on sites which do not send (or obfuscates)
+   Connection:close header.
+ 
 -- Issue #12102: Document that buffered files must be flushed before being used
 -  with mmap. Patch by Steffen Daode Nurpmeso.
 -
 -- Issue #12560: Build libpython.so on OpenBSD. Patch by Stefan Sperling.
 -
  - Issue #1813: Fix codec lookup under Turkish locales.
  
  - Issue #12591: Improve support of "universal newlines" in the subprocess