From: Tim Golden <mail@timgolden.me.uk>
Date: Sun, 3 Nov 2013 14:21:29 +0000 (+0000)
Subject: Issue #10197: merge heads
X-Git-Tag: v3.4.0b1~414
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb6392b0cbaa864e7ba4c559841c77bf58c284c0;p=thirdparty%2FPython%2Fcpython.git

Issue #10197: merge heads
---

eb6392b0cbaa864e7ba4c559841c77bf58c284c0
diff --cc Misc/NEWS
index 3c0e5117a40d,fa12378fb5c9..37acda83883f
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -31,13 -31,9 +31,16 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #6157: Fixed tkinter.Text.debug().  tkinter.Text.bbox() now raises
 +  TypeError instead of TclError on wrong number of arguments.  Original patch
 +  by Guilherme Polo.
 +
+ - Issue #10197: Rework subprocess.get[status]output to use subprocess
+   functionality and thus to work on Windows. Patch by Nick Coghlan
+ 
 +- Issue #6160: The bbox() method of tkinter.Spinbox now returns a tuple of
 +  integers instead of a string.  Based on patch by Guilherme Polo.
 +
  - Issue #19403: contextlib.redirect_stdout is now reentrant
  
  - Issue #19286: Directories in ``package_data`` are no longer added to