From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 14 May 2011 03:52:55 +0000 (+0300)
Subject: #5723: merge with 3.2.
X-Git-Tag: v3.3.0a1~2284
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32e3fdc2d06404c3d5ae637f862a3ce194ea9252;p=python

#5723: merge with 3.2.
---

32e3fdc2d06404c3d5ae637f862a3ce194ea9252
diff --cc Misc/NEWS
index cac1120c90,06fab03b6f..83e1e9d8e9
--- a/Misc/NEWS
+++ 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.