mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
112,466 Commits 6 Branches 604 Tags 2.9 GiB
Commit Graph

115 Commits

Author SHA1 Message Date
Miss Islington (bot) 2e315d87ff
gh-96959: Update more HTTP links (GH-97536) 
Use HTTPS for documents which are available by both HTTP and HTTPS
links, but there is no redirection from HTTP to HTTPS or vice versa.
(cherry picked from commit dd53b79de0)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
 2022-09-27 04:16:23 -07:00
Gregory P. Smith 8f0fa4bd10
[3.10] gh-95778: CVE-2020-10735: Prevent DoS by very large int() (#96501) 
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.

This backports https://github.com/python/cpython/pull/96499 aka 511ca94520

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#).
 2022-09-02 09:51:49 -07:00
Serhiy Storchaka 54d4b4d992
[3.10] gh-91838: Use HTTPS links in docs for resources which redirect to HTTPS (GH-95527) (GH-95644) 
If an HTTP link is redirected to a same looking HTTPS link, the latter can
be used directly without changes in readability and behavior.
It protects from a men-in-the-middle attack.

This change does not affect Python examples..
(cherry picked from commit f79547a429)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
 2022-08-04 12:19:44 +03:00
Miss Islington (bot) 2164b5bad7
[3.10] gh-92417: `json` docs: `dict` is ordered on all supported Python versions (GH-92422) (GH-92465) 
(cherry picked from commit bc098cfdb7)


Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

Automerge-Triggered-By: GH:serhiy-storchaka
 2022-05-08 08:30:18 -07:00
Miss Islington (bot) 15da2a2723
bpo-46001: Change OverflowError to RecursionError in JSON library docstrings (GH-29943) 
(cherry picked from commit 8db06528ca)

Co-authored-by: James Gerity <snoopjedi@gmail.com>
 2021-12-07 02:20:10 -08:00
Miss Islington (bot) 32866dd471
bpo-45441: Update some moved URLs in documentation (GH-28861) 
(cherry picked from commit b37dc9b3bc)

Co-authored-by: 180909 <wjh180909@gmail.com>
 2021-10-12 07:20:43 -07:00
Adorilson Bezerra a347bc0b35
Doc: Improve library/json document. (GH-24390) 2021-03-02 10:51:58 +09:00
Mathieu Dupuy 12695f4c6d
Doc: add a missing period (GH-21819) 2020-08-20 22:08:37 +02:00
Inada Naoki 5bbac8cbdf
bpo-39377: json: Update doc about the encoding option. (GH-18076) 
Co-authored-by: Kyle Stanley <aeros167@gmail.com>
 2020-01-22 19:01:24 +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
Andre Delfino d288b29fc6 Correct minor grammar mistake (GH-15404) 2019-08-23 10:58:27 +01:00
Raymond Hettinger 657008ea03
bpo-30550: Clarify JSON ordering guarantees (GH-15397) 2019-08-22 15:14:42 -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 083a7a172b
bpo-35167: Specify program for gzip and json.tool command line options. (GH-10332) 2018-11-05 17:47:27 +02:00
Evan Allrich 9e84084851 bpo-34379: Doc: Move note for json.dump (GH-8730) 2018-08-11 16:34:02 +09:00
Anthony Sottile bb6366bd75 bpo-17909: Document that json.load can accept a binary IO (GH-7366) 2018-06-07 18:58:12 +09:00
Serhiy Storchaka 46936d5a71
Improve highlighting of some code blocks. (GH-6401) 2018-04-08 19:18:04 +03:00
INADA Naoki 629338f140
bpo-32360: Remove object_pairs_hook=OrderedDict examples (GH-5001) 2018-04-03 12:39:47 +09:00
Sergey Fedoseev a7fbad96c8 Make `json.dumps()` example to be PEP-8 compliant. (GH-3472) 2017-09-09 09:39:36 -07:00
Serhiy Storchaka 5becf38a03 Fix the signature of JSONDecodeError (no end parameter). (#1827) 
Unlikely to the simplejson module, json.JSONDecodeError doesn't accept the end argument.
 2017-05-27 16:11:18 +03:00
Martin Panter 574ff0680f Issues #29189: Merge indentation fixes from 3.5 2017-01-24 00:29:11 +00:00
Martin Panter ef107ee7a0 Issue #29189: Fix indentation in RST markup 2017-01-24 00:26:56 +00:00
Raymond Hettinger a57a8a3e2d Issue #29281: Fill-in a missing versionchanged entry 2017-01-19 21:39:37 -08:00
Serhiy Storchaka c7b1a0bbe2 Issue #28763: Use double hyphens (rendered as en-dashes) in numerical ranges 
in the documentation.
 2016-11-26 13:43:28 +02:00
Serhiy Storchaka 0264e46caa Issue #28763: Use double hyphens (rendered as en-dashes) in numerical ranges 
in the documentation.
 2016-11-26 13:49:59 +02:00
Serhiy Storchaka 58d3e54556 Fixed the documentation of parse_constant argument in json.load(). 
parse_constant doesn't get called on 'null', 'true', 'false' since 3.1/2.7.
 2016-11-12 22:48:33 +02:00
Serhiy Storchaka 022371ff94 Fixed the documentation of parse_constant argument in json.load(). 
parse_constant doesn't get called on 'null', 'true', 'false' since 3.1/2.7.
 2016-11-12 22:47:16 +02:00
Serhiy Storchaka 989db5c880 Issue #19795: Mark up None as literal text. 2016-10-19 16:37:13 +03:00
Serhiy Storchaka ecf41da83e Issue #19795: Mark up None as literal text. 2016-10-19 16:29:26 +03: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
Serhiy Storchaka ee047e589d Issue #4945: Improved the documenting of boolean arguments in the json module. 
Based on patch by Gabriel Genellina.
 2016-06-30 14:03:21 +03:00
Serhiy Storchaka 15287f8bcc Issue #4945: Improved the documenting of boolean arguments in the json module. 
Based on patch by Gabriel Genellina.
 2016-06-30 13:59:12 +03:00
Terry Jan Reedy 58d3f59c2f Merge with 3.5 2016-06-22 22:46:51 -04:00
Terry Jan Reedy dcb6c88a24 Issue #27304: Source code links for sub-packages in the same file. 
Patch by Yoni Lavi
 2016-06-22 22:46:34 -04:00
Serhiy Storchaka aacd53f6cb Issue #18726: All optional parameters of the dump(), dumps(), 
load() and loads() functions and JSONEncoder and JSONDecoder class
constructors in the json module are now keyword-only.
 2016-06-22 00:03:20 +03:00
Terry Jan Reedy fa089b9b0b Issue #22558: Add remaining doc links to source code for Python-coded modules. 
Reformat header above separator line (added if missing) to a common format.
Patch by Yoni Lavi.
 2016-06-11 15:02:54 -04:00
Serhiy Storchaka 6dff0205b7 Issue #26736: Used HTTPS for external links in the documentation if possible. 2016-05-07 10:49:07 +03:00
Georg Brandl 5d94134040 Closes #25910: fix dead and permanently redirected links in the docs. Thanks to SilentGhost for the patch. 2016-02-26 19:37:12 +01:00
Martin Panter 84835ab1cb Issue #25161: Merge full stops from 3.4 into 3.5 2015-10-10 10:44:25 +00:00
Martin Panter d21e0b52f1 Issue #25161: Add full stops in documentation; patch by Takase Arihiro 2015-10-10 10:36:22 +00:00
Serhiy Storchaka 47efb4a5dc Issue #19361: JSON decoder now raises JSONDecodeError instead of ValueError. 2015-01-26 13:16:30 +02:00
Serhiy Storchaka 82e07b92b3 Issue #23181: More "codepoint" -> "code point". 2015-01-18 11:33:31 +02:00
Serhiy Storchaka d3faf43f9b Issue #23181: More "codepoint" -> "code point". 2015-01-18 11:28:37 +02:00
Serhiy Storchaka 7a6915e17d Issue #21514: The documentation of the json module now refers to new JSON RFC 
7159 instead of obsoleted RFC 4627.
 2014-11-27 19:41:47 +02:00
Serhiy Storchaka 715f01b565 Issue #21514: The documentation of the json module now refers to new JSON RFC 
7159 instead of obsoleted RFC 4627.
 2014-11-27 19:45:31 +02:00
Berker Peksag 39e4c4d873 Issue #21650: Add an `--sort-keys` option to json.tool CLI. 2014-11-10 09:56:54 +02:00
Georg Brandl cf3e788da4 merge with 3.4 2014-10-28 22:54:28 +01:00
Georg Brandl 946faa39e3 Using "-m module" is easier to read and understand than "-mmodule". 2014-10-28 22:54:24 +01:00