mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-28 05:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
115179 commits 7 branches 621 tags 3.1 GiB
Commit graph

66 commits

Author SHA1 Message Date
Serhiy Storchaka
db39050396
gh-96959: Update HTTP links which are redirected to HTTPS (GH-96961) 2022-09-24 14:38:53 +03:00
Gregory P. Smith
511ca94520
gh-95778: CVE-2020-10735: Prevent DoS by very large int() (#96499) 
Integer to and from text conversions via CPython's bignum `int` type is not safe against denial of service attacks due to malicious input. Very large input strings with hundred thousands of digits can consume several CPU seconds.

This PR comes fresh from a pile of work done in our private PSRT security response team repo.

Signed-off-by: Christian Heimes [Red Hat] <christian@python.org>
Tons-of-polishing-up-by: Gregory P. Smith [Google] <greg@krypto.org>
Reviews via the private PSRT repo via many others (see the NEWS entry in the PR).

<!-- gh-issue-number: gh-95778 -->
* Issue: gh-95778
<!-- /gh-issue-number -->

I wrote up [a one pager for the release managers](https://docs.google.com/document/d/1KjuF_aXlzPUxTK4BMgezGJ2Pn7uevfX7g0_mvgHlL7Y/edit#). Much of that text wound up in the Issue. Backports PRs already exist. See the issue for links.
 2022-09-02 09:35:08 -07:00
Raymond Hettinger
1f0eafa844
GH-96145: Add AttrDict to JSON module for use with object_hook (#96146) 2022-08-23 16:22:00 -05:00
Christian Heimes
deeaac49e2
bpo-40280: Skip socket, fork, subprocess tests on Emscripten (GH-31986) 
- Add requires_fork and requires_subprocess to more tests
- Skip extension import tests if dlopen is not available
- Don't assume that _testcapi is a shared extension
- Skip a lot of socket tests that don't work on Emscripten
- Skip mmap tests, mmap emulation is incomplete
- venv does not work yet
- Cannot get libc from executable

The "entire" test suite is now passing on Emscripten with EMSDK from git head (91 suites are skipped).
 2022-03-22 03:04:36 -07:00
Victor Stinner
e7a6285f1b
bpo-46542: test_json uses support.infinite_recursion() (GH-30972) 
Fix test_json tests checking for RecursionError: modify these tests
to use support.infinite_recursion().
 2022-01-28 01:35:13 +01:00
Chris Wesseling
815dad42d5
bpo-45644: Make json.tool read infile before writing to outfile (GH-29273) 
so that

$ python -m json.tool foo.json foo.json

doesn't result in an empty foo.json.

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
 2021-11-06 18:11:35 +01:00
Nikita Sobolev
e046aabbe3
bpo-45269: test wrong markers type to c_make_encoder (GH-28540) 2021-09-28 23:18:00 +02:00
Inada Naoki
fb78692f2a
bpo-43651: PEP 597: Fix EncodingWarning in some tests (GH-25189) 
* Fix _sitebuiltins
* Fix test_inspect
* Fix test_interpreters
* Fix test_io
* Fix test_iter
* Fix test_json
* Fix test_linecache
* Fix test_lltrace
* Fix test_logging
* Fix logging
 2021-04-06 11:18:41 +09:00
Hai Shi
883bc63833
bpo-40275: Use new test.support helper submodules in tests (GH-21314) 2020-07-06 11:12:49 +02:00
Victor Stinner
4b972faf60
bpo-40462: Fix typo in test_json (GH-20094) 2020-05-15 01:02:10 +02:00
Dong-hee Na
700cb58730
bpo-39828: Fix json.tool to catch BrokenPipeError (GH-18779) 2020-03-10 08:41:44 +01:00
Inada Naoki
5492bfcefe
bpo-39377: json: Remove the encoding option. (GH-18075) 2020-01-20 13:54:00 +09:00
Daniel Himmelstein
15fb7fa881 bpo-29636: json.tool: Add document for indentation options. (GH-17482) 
And updated test to use subprocess.run
 2019-12-07 23:14:40 +09:00
wim glenn
efefe25443 bpo-27413: json.tool: Add --no-ensure-ascii option. (GH-17472) 2019-12-06 15:44:01 +09:00
Inada Naoki
808769f3a4
bpo-33684: json.tool: Use utf-8 for infile and outfile. (GH-17460) 2019-12-04 18:39:31 +09:00
Daniel Himmelstein
03257949bc bpo-29636: Add --(no-)indent arguments to json.tool (GH-345) 2019-12-04 15:15:19 +09:00
Dong-hee Na
44cd86bbdd bpo-37805: Add tests for json.dump(..., skipkeys=True) (GH-15489) 
https://bugs.python.org/issue37805



Automerge-Triggered-By: @methane
 2019-08-26 00:04:35 -07:00
Matthias Bussonnier
a8abe097c1 bpo-33461: emit DeprecationWarning when json.loads(encoding=...) is used (GH-6762) 2019-04-09 16:17:25 +09:00
HongWeipeng
f194479949 bpo-31553: add --json-lines option to json.tool (#10051) 
* add jsonlines option to json.tool

* code review

* fix:avoid read infile after it close

* improve doc in whatsnew 3.8
 2018-11-07 12:09:32 +02:00
Serhiy Storchaka
ae00fb1d4f
bpo-30877: Fix clearing a cache in the the JSON decoder. (GH-7048) 2018-05-22 14:55:07 +03:00
Oren Milman
7c2d97827f bpo-6986: Add a comment to clarify a test of _json.make_encoder(). (GH-3789) 2018-03-26 18:04:39 +03:00
Serhiy Storchaka
cfa797c068
bpo-24641: Improved error message for JSON unserializible keys. (#4364) 
Also updated an example for default() in the module docstring.
Removed quotes around type name in other error messages.
 2017-11-25 17:38:20 +02:00
Oren Milman
2b382dd612 bpo-31505: Fix an assertion failure in json, in case _json.make_encoder() received a bad encoder() argument. (#3643) 2017-09-24 12:07:12 +03:00
Serhiy Storchaka
49f6449ef4 bpo-30936: Fix a reference leak in json when fail to sort keys. (#2712) 2017-07-16 07:29:16 +03:00
Serhiy Storchaka
d3aaa2f149 bpo-30911: Add tests for bad boolean arguments for accelerated json (#2690) 
encoder and decoder.
 2017-07-13 10:14:11 +03:00
Victor Stinner
d6debb24e0 bpo-29919: Remove unused imports found by pyflakes (#137) 
Make also minor PEP8 coding style fixes on modified imports.
 2017-03-27 16:05:26 +02:00
Daniel Himmelstein
b4e9087e7b Fix stderr bug in json.tool test (#346) 
See https://github.com/python/cpython/pull/201#discussion_r103229425.
 2017-03-15 17:31:06 +03:00
Serhiy Storchaka
c4a35daa97 Issue #28541: Improve test coverage for encoding detection in json library. 
Original patch by Eric Appelt.
 2016-10-30 23:00:01 +02:00
Nick Coghlan
b161562f72 Issue #17909: Accept binary input in json.loads 
json.loads (and hence json.load) now support binary input
encoded as UTF-8, UTF-16 or UTF-32.

Patch by Serhiy Storchaka.
 2016-09-10 20:16:18 +10:00
Martin Panter
1aa642f6bd Issue #27993: Merge plural fixes from 3.5 2016-09-07 23:36:43 +00:00
Martin Panter
0f0eac431f Issue #27993: Fix problems with plural objects in docs and comments 2016-09-07 11:04:41 +00:00
Serhiy Storchaka
a6f26c1d34 Remove more unused imports in tests. 2016-04-25 00:05:30 +03:00
Berker Peksag
1e8ee9b380 Issue #23277: Remove unused sys and os imports 
Patch by Jon Dufresne.
 2016-04-24 07:31:42 +03:00
Serhiy Storchaka
f002225f7e Issue #24683: Fixed crashes in _json functions called with arguments of 
inappropriate type.
 2015-07-26 09:02:23 +03:00
Serhiy Storchaka
83236f7a8b Issue #24683: Fixed crashes in _json functions called with arguments of 
inappropriate type.
 2015-07-26 09:01:22 +03:00
Yury Selivanov
f488fb422a Issue #19235: Add new RecursionError exception. Patch by Georg Brandl. 2015-07-03 01:04:23 -04:00
Berker Peksag
ce643913a9 Issue #9517: Move script_helper to the support package. 
Patch by Christie Wilson.
 2015-05-06 06:33:17 +03:00
Benjamin Peterson
88abdef02b merge 3.4 (#24094) 2015-05-02 22:37:13 -04:00
Benjamin Peterson
122f4b1bda merge 3.3 (#24094) 2015-05-02 22:36:26 -04:00
Benjamin Peterson
501182a47b just sort the items tuple directly (closes #24094) 2015-05-02 22:28:04 -04:00
Benjamin Peterson
0b2a6dc42b merge 3.4 2015-02-02 17:47:31 -05:00
Benjamin Peterson
b0ef78535a merge 3.3 2015-02-02 17:47:26 -05:00
Benjamin Peterson
1572944499 reduce memory usage of test (closes #23369) 2015-02-02 17:47:07 -05:00
Benjamin Peterson
83e814d852 merge 3.4 2015-02-01 18:02:21 -05:00
Benjamin Peterson
c0b743a97b merge 3.3 2015-02-01 18:02:15 -05:00
Benjamin Peterson
68389eaa3f remove extra ws 2015-02-01 18:02:09 -05:00
Benjamin Peterson
71cf91cc09 merge 3.4 (#23369) 2015-02-01 18:00:19 -05:00
Benjamin Peterson
3675cd9db1 merge 3.3 (#23369) 2015-02-01 17:59:49 -05:00
Benjamin Peterson
e3bfe19358 fix possible overflow in encode_basestring_ascii (closes #23369) 2015-02-01 17:53:53 -05:00
Serhiy Storchaka
47efb4a5dc Issue #19361: JSON decoder now raises JSONDecodeError instead of ValueError. 2015-01-26 13:16:30 +02:00