From: Zachary Ware <zachary.ware@gmail.com>
Date: Mon, 16 Dec 2013 15:05:44 +0000 (-0600)
Subject: Issue #19987: Merge with 3.3
X-Git-Tag: v3.4.0b2~203
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d2e48ca813a70edc4a28477c150ad8079df584e6;p=thirdparty%2FPython%2Fcpython.git

Issue #19987: Merge with 3.3
---

d2e48ca813a70edc4a28477c150ad8079df584e6
diff --cc Misc/NEWS
index 7f34fca751f0,cacfb7c6b7b5..628c2fe3e525
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -197,9 -160,7 +197,9 @@@ Test
  - Issue #19926: Removed unneeded test_main from test_abstract_numbers.
    Patch by Vajrasky Kok.
  
 +- Issue #19572: More skipped tests explicitly marked as skipped.
 +
- - Issue #19595: Re-enabled a long-disabled test in test_winsound.
+ - Issue #19595, #19987: Re-enabled a long-disabled test in test_winsound.
  
  - Issue #19588: Fixed tests in test_random that were silently skipped most
    of the time.  Patch by Julian Gindi.