]> granicus.if.org Git - python/commitdiff
Issue #19828: Merge with 3.3
authorZachary Ware <zachary.ware@gmail.com>
Wed, 11 Dec 2013 23:01:21 +0000 (17:01 -0600)
committerZachary Ware <zachary.ware@gmail.com>
Wed, 11 Dec 2013 23:01:21 +0000 (17:01 -0600)
1  2 
Lib/test/test_site.py
Misc/NEWS

Simple merge
diff --cc Misc/NEWS
index 7b1dd488bc0dddf6c050b9a8df8a9206206c0f26,35e7a06a1f185072917d79e591e23ce4bc69b477..2c1df0943ce33dcdc817537da9feba91bfe0faa7
+++ b/Misc/NEWS
@@@ -151,10 -130,11 +151,12 @@@ IDL
  Tests
  -----
  
+ - Issue #19828: Fixed test_site when the whole suite is run with -S.
  - Issue #19928: Implemented a test for repr() of cell objects.
  
 -- Issue #19535: Fixed test_docxmlrpc when python is run with -OO.
 +- Issue #19535: Fixed test_docxmlrpc, test_functools, test_inspect, and
 +  test_statistics when python is run with -OO.
  
  - Issue #19926: Removed unneeded test_main from test_abstract_numbers.
    Patch by Vajrasky Kok.