Commit graph

3860 commits

Author SHA1 Message Date
Pablo Galindo
af63fa0dcd
Post 3.10.8 2022-10-11 18:27:10 +01:00
Pablo Galindo
aaaf517424
Python 3.10.8 2022-10-11 12:21:44 +01:00
Miss Islington (bot)
437032e313
gh-96959: Update HTTP links which are redirected to HTTPS (GH-96961)
(cherry picked from commit db39050396)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-09-25 01:20:53 -07:00
Pablo Galindo
0abc6a3493
Post 3.10.7 2022-09-06 10:18:34 +01:00
Pablo Galindo
6cc6b13308
Python 3.10.7 2022-09-05 14:00:02 +01:00
Gregory P. Smith
eace09e63e
[3.10] gh-95778: Correctly pre-check for int-to-str conversion (GH-96537) (#96563)
Converting a large enough `int` to a decimal string raises `ValueError` as expected. However, the raise comes _after_ the quadratic-time base-conversion algorithm has run to completion. For effective DOS prevention, we need some kind of check before entering the quadratic-time loop. Oops! =)

The quick fix: essentially we catch _most_ values that exceed the threshold up front. Those that slip through will still be on the small side (read: sufficiently fast), and will get caught by the existing check so that the limit remains exact.

The justification for the current check. The C code check is:
```c
max_str_digits / (3 * PyLong_SHIFT) <= (size_a - 11) / 10
```

In GitHub markdown math-speak, writing $M$ for `max_str_digits`, $L$ for `PyLong_SHIFT` and $s$ for `size_a`, that check is:
$$\left\lfloor\frac{M}{3L}\right\rfloor \le \left\lfloor\frac{s - 11}{10}\right\rfloor$$

From this it follows that
$$\frac{M}{3L} < \frac{s-1}{10}$$
hence that
$$\frac{L(s-1)}{M} > \frac{10}{3} > \log_2(10).$$
So
$$2^{L(s-1)} > 10^M.$$
But our input integer $a$ satisfies $|a| \ge 2^{L(s-1)}$, so $|a|$ is larger than $10^M$. This shows that we don't accidentally capture anything _below_ the intended limit in the check.

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

Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
(cherry picked from commit b126196838)

Co-authored-by: Mark Dickinson <dickinsm@gmail.com>
2022-09-04 09:54:56 -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
Miss Islington (bot)
83bde57f6e
Fix typo in internal/pycore_atomic.h (GH-95939)
(cherry picked from commit 8281cbddc6)

Co-authored-by: fluesvamp <105884371+fluesvamp@users.noreply.github.com>
2022-08-12 21:05:37 -07:00
Pablo Galindo
ee2f45a061
Post 3.10.6 2022-08-02 11:05:09 +01:00
Pablo Galindo
9c7b4bd164
Python 3.10.6 2022-08-01 21:25:27 +01:00
Miss Islington (bot)
968b238b5e
[3.11] gh-93741: Add private C API _PyImport_GetModuleAttrString() (GH-93742) (GH-93792)
It combines PyImport_ImportModule() and PyObject_GetAttrString()
and saves 4-6 lines of code on every use.

Add also _PyImport_GetModuleAttr() which takes Python strings as arguments.
(cherry picked from commit 6fd4c8ec77)
(cherry picked from commit d42b3689f4)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-06-16 00:19:29 -07:00
Pablo Galindo
1b7996cf73
Post 3.10.5 2022-06-06 18:13:35 +01:00
Pablo Galindo
f377153967
Python 3.10.5 2022-06-06 12:53:30 +01:00
Miss Islington (bot)
a4bea26ee4
gh-93065: Fix HAMT to iterate correctly over 7-level deep trees (GH-93066) (GH-93146)
Also while there, clarify a few things about why we reduce the hash to 32 bits.

Co-authored-by: Eli Libman <eli@hyro.ai>
Co-authored-by: Yury Selivanov <yury@edgedb.com>
Co-authored-by: Łukasz Langa <lukasz@langa.pl>

(cherry picked from commit c1f5c903a7)
2022-05-24 10:52:29 +02:00
Pablo Galindo
4d37dc69bd
Post 3.10.4 2022-03-24 10:30:34 +00:00
Pablo Galindo
9d38120e33
Python 3.10.4 2022-03-23 20:12:04 +00:00
Pablo Galindo
b7c6119377
Post 3.10.3 2022-03-16 14:30:58 +00:00
Pablo Galindo
a342a49189
Python 3.10.3 2022-03-16 11:27:11 +00:00
Pablo Galindo Salgado
5b58db7529
[3.10] bpo-46521: Fix codeop to use a new partial-input mode of the parser (GH-31010). (GH-31213)
(cherry picked from commit 69e10976b2)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
2022-02-08 12:25:15 +00:00
Pablo Galindo
d5c4ccfe0d
Post 3.10.2 2022-01-14 21:11:47 +00:00
Pablo Galindo
a58ebcc701
Python 3.10.2 2022-01-13 18:52:14 +00:00
Victor Stinner
72c260cf0c
[3.10] bpo-46006: Revert "bpo-40521: Per-interpreter interned strings (GH-20085)" (GH-30422) (GH-30425)
This reverts commit ea251806b8.

Keep "assert(interned == NULL);" in _PyUnicode_Fini(), but only for
the main interpreter.

Keep _PyUnicode_ClearInterned() changes avoiding the creation of a
temporary Python list object.

Leave the PyInterpreterState structure unchanged to keep the ABI
backward compatibility with Python 3.10.0: rename the "interned"
member to "unused_interned".

(cherry picked from commit 35d6540c90)
2022-01-06 16:12:28 +01:00
Miss Islington (bot)
438817fdd5
bpo-46042: Improve SyntaxError locations in the symbol table (GH-30059) (GH-30064)
(cherry picked from commit 59435eea08)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
2021-12-12 01:24:12 +00:00
Pablo Galindo
bf1812ef61
Post 3.10.1 2021-12-06 18:52:20 +00:00
Pablo Galindo
2cd268a3a9
Python 3.10.1 2021-12-06 18:23:39 +00:00
Victor Stinner
ce5a6460ae
bpo-39026: Fix Python.h when building with Xcode (GH-29488) (GH-29732)
Fix Python.h to build C extensions with Xcode: remove a relative
include from Include/cpython/pystate.h.

(cherry picked from commit 4ae26b9c1d)
2021-11-25 13:35:22 +01:00
Miss Islington (bot)
cd85d91bc6
bpo-45893: Add missing extern C to initconfig.h (GH-29761)
Co-authored-by: Steve Dower <steve.dower@python.org>
(cherry picked from commit f4afc53bf6)

Co-authored-by: Christian Heimes <christian@python.org>
2021-11-24 13:57:41 -08:00
Łukasz Langa
904af3de2b
[3.10] bpo-45848: Allow the parser to get error lines from encoded files (GH-29646) (GH-29661)
(cherry picked from commit fdcc46d955)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
2021-11-20 16:34:56 +01:00
Serhiy Storchaka
4641afef66
[3.10] bpo-45467: Fix IncrementalDecoder and StreamReader in the "raw-unicode-escape" codec (GH-28944) (GH-28952)
They support now splitting escape sequences between input chunks.

Add the third parameter "final" in codecs.raw_unicode_escape_decode().
It is True by default to match the former behavior.
(cherry picked from commit 39aa98346d)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2021-10-14 21:23:39 +03:00
Miss Islington (bot)
0bff4ccbfd
[3.10] bpo-45461: Fix IncrementalDecoder and StreamReader in the "unicode-escape" codec (GH-28939) (GH-28943)
They support now splitting escape sequences between input chunks.

Add the third parameter "final" in codecs.unicode_escape_decode().
It is True by default to match the former behavior.
(cherry picked from commit c96d1546b1)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2021-10-14 20:02:20 +03:00
Christian Clauss
f6798391b5
[3.10] Fix typos in the Include directory (GH-28745) (GH-28789)
(cherry picked from commit 8e8f752217)
2021-10-07 06:00:23 -07:00
Pablo Galindo
1e328afb04
Post 3.10.0 2021-10-04 20:17:37 +01:00
Pablo Galindo
6145192287 Python 3.10.0
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEz9yiRbEEPPKl+Xhl/+h0BBaL2EcFAmFbPJ8ACgkQ/+h0BBaL
 2EfHRRAAvS0Z8NNZXSzsyQ42kLtR6Sni7hxw5D1ChD0h4hSk+zyybUUnMlAiZhf+
 fGuoj3rTncE/J756EYlF9/tuNVgx/LAkLNzFAIBnCq/r1xaHBQ/E4QxxMoqNQ2Bq
 xfB0gyGScy1HtMF6thhv18udG0Npgu+eIbwtqtVdJeUkuTgTsUz7+EOu9FZdap4t
 s/PB7F29gw8UVVMz8kR6IyIE1Rq6cvSilvgaLkzHiG9A9qLdUDE6qAo2bmx87J20
 7m0IkjqSkIyuNQDCI+lhehCgYNcOqy5f/rwCF1363cCErIZMpo6JOM/Jn9EwGO2H
 Utttg3KghgHiI7Yf2IFTxL2iCgfDiQ871PgcySNeYdM8dCPH/hrWpX5mi6a5Px3f
 8in3QbEN1mCOQFo92b/WyD90L6wpkjjPhMMdvyxaxDH2hluKSa6RCi+0dcegx+qK
 59mJxiz1d52mfRbyq0m0fQXUDcWbtzUgNwa6FYfDoS8bPGT8Fzt5boeI+QxUlUMX
 E3Pqb0s8vt8+Vgyk8xmNK+SbK6JLhYw7p1QYomRI3nS2IgrbRdTL2KQYTwbpnkQV
 vjmEbzMCZRFI9wiozBm8t7PITydTSfcC7DSho31FK9yKd9g1sWjhY7Oclgabezx6
 PjLsg41K/tKLixDqpMAYpPU/1Kdp7i9QHiPckjGRWSqRy2whTwU=
 =A8if
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEz9yiRbEEPPKl+Xhl/+h0BBaL2EcFAmFbUgcACgkQ/+h0BBaL
 2EfmqQ//Tm0Se1IUjcdR2Mlzc75kqZh/q7zSe8e56sgQsAPpkVnZ7eWvQ4QrYYYo
 UEUS/4PRBO3T/aCX4F6rnfZXOfUDrS6u5u6o/bGqBdvyT+0TX3sx33+WioaOrRgH
 7g4Q4NzG+JsfZewADtQHMTpe2v7yfkw9XsK7RUogqn0SXW5csXeRQf7WOdXki9mq
 gIoILPACu4gXyUpYKHGJBbDTF8JbM0sC71bo1WkENMtmFgnGyGuooz4v01NDt+RI
 ZHGjUSLjEMf68TuYnsMzCY/DwFK+uENeISC2jXZKwCTT36TkC7TFQUs24NxDNlPn
 tBf0AqBOBpLXliZZzkHFkHXFKTA+7NDEJu0vdyBq+o+3m9lBd2SJlE+1yWUT06c4
 uirJpRNUVlD/RLAecfBLByJpqKBQA4G/q/MocD32xWqQqCkeSxf1x5gc3YPmfMMp
 jXaNEzp7yP/XVIxvsT+fA6Kpp7ySxTpNNCgrhzEH3GfC/p8g7hBuPYNEjFiYOPQQ
 WS5NbJsuAi7SdfATxcjYaVkQzsn8mJYcN1cUD1HQvCNb28jLFEzzgdIPCDLkTHKL
 35SrFiTJFYXqWZa140j9L/3YROAsUJAmP+jdzRtEYqS4BKpuc0DVWt8p1+bFERH9
 UnMzn5PReIufBi5BjAW6SMNhHYoZC0nqX90T9aQAftYyuBF3d4U=
 =T4+A
 -----END PGP SIGNATURE-----

Merge tag 'v3.10.0' into 3.10

Python 3.10.0
2021-10-04 20:12:06 +01:00
Pablo Galindo
b494f5935c
Python 3.10.0 2021-10-04 18:40:46 +01:00
Serhiy Storchaka
edf190b97e
[3.10] Remove trailing spaces (GH-28709) 2021-10-04 00:40:48 +01:00
Serhiy Storchaka
93242d7a2a
[3.10] Remove trailing spaces (GH-28709) 2021-10-03 20:03:49 +03:00
Miss Islington (bot)
80285ecc8d
closes bpo-44751: Move crypt.h include from public header to _cryptmodule (GH-27394) (GH-28636)
Automerge-Triggered-By: GH:benjaminp
(cherry picked from commit 196998e220)

Co-authored-by: Geoffrey Thomas <geofft@ldpreload.com>
2021-09-30 01:02:11 +02:00
Łukasz Langa
b09a68ac87
[3.10] [codemod] Fix non-matching bracket pairs (GH-28473) (GH-28511)
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit 8f943ca257)

Co-authored-by: Mohamad Mansour <66031317+mohamadmansourX@users.noreply.github.com>
2021-09-29 12:36:59 +01:00
Serhiy Storchaka
2ca4ab8031
[3.10] bpo-45307: Restore private C API function _PyImport_FindExtensionObject() (GH-28594)
py2exe and PyOxidizer rely on this API.
It will be removed in Python 3.11.

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
2021-09-29 12:27:08 +01:00
Serhiy Storchaka
ec4e2ec241
[3.10] bpo-45307: Restore private C API function _PyImport_FindExtensionObject() (GH-28594)
py2exe and PyOxidizer rely on this API.
It will be removed in Python 3.11.

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
2021-09-28 23:12:50 +02:00
Łukasz Langa
8c1e1da565
[3.10] [codemod] Fix non-matching bracket pairs (GH-28473) (GH-28511)
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit 8f943ca257)

Co-authored-by: Mohamad Mansour <66031317+mohamadmansourX@users.noreply.github.com>
2021-09-22 01:33:59 +02:00
Miss Islington (bot)
6b996d61c9
[3.10] bpo-45083: Include the exception class qualname when formatting an exception (GH-28119) (GH-28134)
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
(cherry picked from commit b4b6342848)

Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>

* Use a private version of _PyType_GetQualName

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
2021-09-08 18:32:19 +02:00
Pablo Galindo
8afab2ebbc
Post 3.10.0rc2 2021-09-07 15:39:51 +01:00
Pablo Galindo
839d789394
Python 3.10.0rc2 2021-09-07 14:18:28 +01:00
Miss Islington (bot)
53257cf19f
bpo-45123: PyAiter_Check and PyObject_GetAiter fix & rename. (GH-28194) (GH-28199)
Fix PyAiter_Check to only check for the `__anext__` presense (not for
`__aiter__`). Rename `PyAiter_Check()` to `PyAIter_Check()`,
`PyObject_GetAiter()` -> `PyObject_GetAIter()`.
2021-09-07 12:43:33 +01:00
Pablo Galindo
2b8d4eaec9
Post 3.10.0rc1 2021-08-02 22:37:13 +01:00
Pablo Galindo
cc115e5bf6
Python 3.10.0rc1 2021-08-02 20:53:59 +01:00
Miss Islington (bot)
6b922dae6c
bpo-41103: Resurrect the old buffer protocol. (GH-27437) (GH-27441)
Revert "bpo-41103: Remove old buffer protocol support (GH-21117)"

This reverts commit 6f8a6ee59c.
(cherry picked from commit ce5e1a6809)

Co-authored-by: Inada Naoki <songofacandy@gmail.com>
2021-07-29 13:31:42 +02:00
Miss Islington (bot)
632e8a6959
bpo-42747: Remove Py_TPFLAGS_HAVE_AM_SEND and make Py_TPFLAGS_HAVE_VERSION_TAG no-op (GH-27260) (GH-27306)
* Remove code that checks Py_TPFLAGS_HAVE_VERSION_TAG

    The field is always present in the type struct, as explained
    in the added comment.

* Remove Py_TPFLAGS_HAVE_AM_SEND

    The flag is not needed, and since it was added in 3.10 it can be removed now.
(cherry picked from commit a4760cc32d)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
2021-07-23 16:56:53 +02:00
Serhiy Storchaka
a6670cdf77
[3.10] bpo-44654: Do not export the union type related symbols (GH-27223). (GH-27225)
(cherry picked from commit 8f50f44592)
2021-07-18 18:37:41 +03:00