Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [3.6] bpo-31505: Fix an assertion failure in json, in case ↵ | Miss Islington (bot) | 2017-09-27 | 1 | -0/+21 |
| | | | | | _json.make_encoder() received a bad encoder() argument. (GH-3643) (#3777) (cherry picked from commit 2b382dd6121bb1e4b75470fb3ef8555665df3eb6) | ||||
* | [3.6] bpo-30936: Fix a reference leak in json when fail to sort keys. ↵ | Serhiy Storchaka | 2017-07-16 | 1 | -0/+4 |
| | | | | | (GH-2712). (#2727) (cherry picked from commit 49f6449ef4b81537c19b82329caaf60596c516c2) | ||||
* | [3.6] bpo-30911: Add tests for bad boolean arguments for accelerated json ↵ | Serhiy Storchaka | 2017-07-13 | 1 | -0/+22 |
| | | | | | | (GH-2690) (#2692) encoder and decoder. (cherry picked from commit d3aaa2f) | ||||
* | Fix stderr bug in json.tool test (#346) (#676) | Berker Peksag | 2017-03-16 | 1 | -5/+4 |
| | | | See https://github.com/python/cpython/pull/201#discussion_r103229425.(cherry picked from commit b4e9087e7b77e8f76feac76f9c1ab21b49c0c766) | ||||
* | Issue #28541: Improve test coverage for encoding detection in json library. | Serhiy Storchaka | 2016-10-30 | 1 | -0/+13 |
| | | | | Original patch by Eric Appelt. | ||||
* | Issue #17909: Accept binary input in json.loads | Nick Coghlan | 2016-09-10 | 2 | -6/+14 |
| | | | | | | | json.loads (and hence json.load) now support binary input encoded as UTF-8, UTF-16 or UTF-32. Patch by Serhiy Storchaka. | ||||
* | Issue #27993: Merge plural fixes from 3.5 | Martin Panter | 2016-09-07 | 1 | -1/+1 |
|\ | |||||
| * | Issue #27993: Fix problems with plural objects in docs and comments | Martin Panter | 2016-09-07 | 1 | -1/+1 |
| | | |||||
* | | Remove more unused imports in tests. | Serhiy Storchaka | 2016-04-24 | 1 | -1/+0 |
| | | |||||
* | | Issue #23277: Remove unused sys and os imports | Berker Peksag | 2016-04-24 | 1 | -1/+0 |
|/ | | | | Patch by Jon Dufresne. | ||||
* | Issue #24683: Fixed crashes in _json functions called with arguments of | Serhiy Storchaka | 2015-07-26 | 1 | -0/+6 |
|\ | | | | | | | inappropriate type. | ||||
| * | Issue #24683: Fixed crashes in _json functions called with arguments of | Serhiy Storchaka | 2015-07-26 | 1 | -0/+6 |
| | | | | | | | | inappropriate type. | ||||
* | | Issue #19235: Add new RecursionError exception. Patch by Georg Brandl. | Yury Selivanov | 2015-07-03 | 1 | -6/+6 |
| | | |||||
* | | Issue #9517: Move script_helper to the support package. | Berker Peksag | 2015-05-06 | 1 | -1/+1 |
| | | | | | | | | Patch by Christie Wilson. | ||||
* | | merge 3.4 (#24094) | Benjamin Peterson | 2015-05-03 | 1 | -0/+19 |
|\ \ | |/ | |||||
| * | merge 3.3 (#24094) | Benjamin Peterson | 2015-05-03 | 1 | -0/+19 |
| |\ | |||||
| | * | just sort the items tuple directly (closes #24094) | Benjamin Peterson | 2015-05-03 | 1 | -0/+19 |
| | | | |||||
* | | | merge 3.4 | Benjamin Peterson | 2015-02-02 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | merge 3.3 | Benjamin Peterson | 2015-02-02 | 1 | -1/+2 |
| |\ \ | | |/ | |||||
| | * | reduce memory usage of test (closes #23369) | Benjamin Peterson | 2015-02-02 | 1 | -1/+2 |
| | | | |||||
* | | | merge 3.4 | Benjamin Peterson | 2015-02-01 | 1 | -1/+0 |
|\ \ \ | |/ / | |||||
| * | | merge 3.3 | Benjamin Peterson | 2015-02-01 | 1 | -1/+0 |
| |\ \ | | |/ | |||||
| | * | remove extra ws | Benjamin Peterson | 2015-02-01 | 1 | -1/+0 |
| | | | |||||
* | | | merge 3.4 (#23369) | Benjamin Peterson | 2015-02-01 | 1 | -1/+8 |
|\ \ \ | |/ / | |||||
| * | | merge 3.3 (#23369) | Benjamin Peterson | 2015-02-01 | 1 | -1/+8 |
| |\ \ | | |/ | |||||
| | * | fix possible overflow in encode_basestring_ascii (closes #23369) | Benjamin Peterson | 2015-02-01 | 1 | -1/+8 |
| | | | |||||
* | | | Issue #19361: JSON decoder now raises JSONDecodeError instead of ValueError. | Serhiy Storchaka | 2015-01-26 | 4 | -23/+50 |
| | | | |||||
* | | | Issue #23206: Make ``json.dumps(..., ensure_ascii=False)`` as fast as the ↵ | Antoine Pitrou | 2015-01-11 | 1 | -3/+0 |
| | | | | | | | | | | | | default case of ``ensure_ascii=True``. Patch by Naoki Inada. | ||||
* | | | Issue #21650: Add an `--sort-keys` option to json.tool CLI. | Berker Peksag | 2014-11-10 | 1 | -1/+32 |
| | | | |||||
* | | | Closes #22002: Merge with 3.4 | Zachary Ware | 2014-07-23 | 1 | -15/+4 |
|\ \ \ | |/ / | |||||
| * | | Issue #22002: Make full use of test discovery in test sub-packages. | Zachary Ware | 2014-07-23 | 1 | -15/+4 |
| | | | | | | | | | | | | | | | | | | Adds `load_package_tests` function to test.support, uses it in test_asyncio, test_email, test_json, test_tools, test_importlib and all test_importlib sub-packages to implement test discovery. | ||||
* | | | merge 3.4 | Benjamin Peterson | 2014-04-14 | 1 | -0/+4 |
|\ \ \ | |/ / | |||||
| * | | merge 3.3 | Benjamin Peterson | 2014-04-14 | 1 | -0/+4 |
| |\ \ | | |/ | |||||
| | * | merge 3.2 | Benjamin Peterson | 2014-04-14 | 1 | -0/+4 |
| | | | |||||
* | | | improve the command-line interface of json.tool (closes #21000) | Benjamin Peterson | 2014-03-22 | 1 | -0/+8 |
|/ / | | | | | | | A patch from Berker Peksag. | ||||
* | | Issue #11489: JSON decoder now accepts lone surrogates. | Serhiy Storchaka | 2013-11-26 | 1 | -4/+47 |
|\ \ | |/ | |||||
| * | Issue #11489: JSON decoder now accepts lone surrogates. | Serhiy Storchaka | 2013-11-26 | 1 | -4/+47 |
| | | |||||
* | | #18958: Improve error message for json.load(s) while passing a string that ↵ | Ezio Melotti | 2013-10-20 | 1 | -0/+14 |
| | | | | | | | | starts with a UTF-8 BOM. | ||||
* | | #19307: Improve error message for json.load(s) while passing objects of the ↵ | Ezio Melotti | 2013-10-20 | 1 | -1/+8 |
| | | | | | | | | wrong type. | ||||
* | | Close #18745: Improve enum tests in test_json for infinities and NaN. | Ethan Furman | 2013-09-02 | 1 | -5/+44 |
| | | |||||
* | | Close #18264: int- and float-derived enums now converted to int or float. | Ethan Furman | 2013-08-10 | 1 | -0/+81 |
| | | |||||
* | | #18273: merge with 3.3. | Ezio Melotti | 2013-08-08 | 2 | -0/+93 |
|/ | |||||
* | #18273: move the tests in Lib/test/json_tests to Lib/test/test_json and make ↵ | Ezio Melotti | 2013-08-08 | 18 | -0/+975 |
them discoverable by unittest. Patch by Zachary Ware. |