Commit Graph

23 Commits

Author SHA1 Message Date
Ezio Melotti 159f12e335 #16549: merge with 3.2. 2012-11-29 05:10:31 +02:00
Ezio Melotti 4927633ab6 #16549: fix test failures on Windows. 2012-11-29 05:10:07 +02:00
Ezio Melotti 4cee810f5d #16476: merge with 3.2. 2012-11-29 02:26:15 +02:00
Ezio Melotti b32512ed9a #16476: Fix json.tool to avoid including trailing whitespace. 2012-11-29 02:25:03 +02:00
Ezio Melotti 1e86d01e1e #16549: merge with 3.2. 2012-11-29 02:16:58 +02:00
Ezio Melotti 057bcb4c6c #16549: Make json.tool work again on Python 3 and add tests. Initial patch by Berker Peksag and Serhiy Storchaka. 2012-11-29 02:15:18 +02:00
Ezio Melotti c483034048 #16559: merge with 3.2. 2012-11-26 19:27:02 +02:00
Ezio Melotti 8c52370403 #16559: Add more tests for the json module. Patch by Serhiy Storchaka. 2012-11-26 19:24:20 +02:00
Antoine Pitrou 5ebe65f8cb Issue #16228: Fix a crash in the json module where a list changes size while it is being encoded.
Patch by Serhiy Storchaka.
2012-11-01 19:59:21 +01:00
Antoine Pitrou 9f69e79c45 Issue #16228: Fix a crash in the json module where a list changes size while it is being encoded.
Patch by Serhiy Storchaka.
2012-11-01 19:52:06 +01:00
Ezio Melotti b9717b5e02 #15752: merge with 3.2. 2012-08-21 11:39:47 +03:00
Ezio Melotti 1b47bf43a6 #15752: s/assertRaisesRegexp/assertRaisesRegex/g 2012-08-21 11:38:41 +03:00
Antoine Pitrou dbcae3c191 Issue #15615: Add some tests for the json module's handling of invalid input data.
Patch by Kushal Das.
2012-08-18 20:48:17 +02:00
Antoine Pitrou b47ea9a6fe Issue #15615: Add some tests for the json module's handling of invalid input data.
Patch by Kushal Das.
2012-08-18 20:46:23 +02:00
Antoine Pitrou 031487eb3b Fix test failure 2011-10-04 10:39:54 +02:00
Martin v. Löwis d63a3b8beb Implement PEP 393. 2011-09-28 07:41:54 +02:00
Antoine Pitrou df7fc9dda7 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. 2011-08-19 18:03:14 +02:00
Ezio Melotti 6b60fb9148 #5723: merge with 3.1. 2011-05-14 06:47:51 +03:00
Ezio Melotti f188bc5d46 #12051: merge with 3.1. 2011-05-11 01:10:27 +03:00
Ezio Melotti 06383ee090 #12017: merge with 3.1. 2011-05-07 18:15:34 +03:00
Ezio Melotti 04c6423fba Merge with 3.1. 2011-04-13 07:18:24 +03:00
R David Murray d5315482e9 Merge #10019: Fix regression relative to 2.6: add newlines if indent=0
Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
2011-04-12 21:09:18 -04:00
Alexander Belopolsky ff27ee0b40 Issue #10572: Moved json tests to Lib/test/json_tests.
Approved by Raymond Hettinger.
2010-11-30 03:03:30 +00:00