]> granicus.if.org Git - python/commitdiff
#5723: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 14 May 2011 03:52:55 +0000 (06:52 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 14 May 2011 03:52:55 +0000 (06:52 +0300)
1  2 
Lib/test/support.py
Misc/NEWS

Simple merge
diff --cc Misc/NEWS
index cac1120c90cc8d3387d1c0050599a4aa707bf5ad,06fab03b6f0e3f0f70da31893df541d3a6996c61..83e1e9d8e9f4dbee8bed379a93ec31dd71d9bb71
+++ b/Misc/NEWS
@@@ -659,8 -379,8 +659,10 @@@ Extension Module
  Tests
  -----
  
+ - Issue #5723: Improve json tests to be executed with and without accelerations.
 +- Issue #12041: Make test_wait3 more robust.
 +
  - Issue #11873: Change regex in test_compileall to fix occasional failures when
    when the randomly generated temporary path happened to match the regex.