]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #19987: Merge with 3.3
authorZachary Ware <zachary.ware@gmail.com>
Mon, 16 Dec 2013 15:05:44 +0000 (09:05 -0600)
committerZachary Ware <zachary.ware@gmail.com>
Mon, 16 Dec 2013 15:05:44 +0000 (09:05 -0600)
1  2 
Lib/test/test_winsound.py
Misc/NEWS

Simple merge
diff --cc Misc/NEWS
index 7f34fca751f030b306bf018cec67cb5bafe586c7,cacfb7c6b7b5a8e3e69ce470dabe9339ee79a023..628c2fe3e525baa074b644abfc69a06dbfcd5dd9
+++ 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 #19595: Re-enabled a long-disabled test in test_winsound.
 +- Issue #19572: More skipped tests explicitly marked as skipped.
 +
+ - 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.