]> git.ipfire.org Git - thirdparty/Python/cpython.git/log
thirdparty/Python/cpython.git
4 years agobpo-44911: Fixed IsolatedAsyncioTestCase from throwing an exception on leaked tasks... 27780/head
Miss Islington (bot) [Mon, 16 Aug 2021 09:54:58 +0000 (02:54 -0700)] 
bpo-44911: Fixed IsolatedAsyncioTestCase from throwing an exception on leaked tasks (GH-27765)

(cherry picked from commit 2cb1a6806c0cefab0c3a40fdd428a89a4392570e)

Co-authored-by: Bar Harel <bar.harel@biocatch.com>
4 years agobpo-44895: skip test_no_hang_on_context_chain_cycle2 until the refleak is fixed ...
Miss Islington (bot) [Mon, 16 Aug 2021 09:01:14 +0000 (02:01 -0700)] 
bpo-44895: skip test_no_hang_on_context_chain_cycle2 until the refleak is fixed (GH-27761)

(cherry picked from commit 62bc716fde20fcb7b47416c7959be9e66df93212)

Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
4 years ago[3.10] bpo-44830 - Remove the broken Broken Mozilla devguide link. (GH-27664) (GH...
Senthil Kumaran [Mon, 16 Aug 2021 08:48:08 +0000 (01:48 -0700)] 
[3.10] bpo-44830 - Remove the broken Broken Mozilla devguide link. (GH-27664) (GH-27666)

(cherry picked from commit ebecffdb6d5fffa4249f9a813f1fc1915926feb5)

Co-authored-by: Senthil Kumaran <senthil@python.org>
4 years agobpo-44907: Update error messages in tutorial examples (GH-27755)
Miss Islington (bot) [Sat, 14 Aug 2021 00:25:11 +0000 (17:25 -0700)] 
bpo-44907: Update error messages in tutorial examples (GH-27755)

(cherry picked from commit ed524b4569b1e4a166886c880018418d46284378)

Co-authored-by: meowmeowmeowcat <meowmeowcat1211@gmail.com>
4 years agobpo-36700: [doc] Update base64 RFC references to RFC 4648 (GH-27700)
Miss Islington (bot) [Fri, 13 Aug 2021 11:21:53 +0000 (04:21 -0700)] 
bpo-36700: [doc] Update base64 RFC references to RFC 4648 (GH-27700)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit e43b9bbc31c22a0d97dc4fc420300e40c2d74166)

Co-authored-by: andrei kulakov <andrei.avk@gmail.com>
4 years agobpo-26228: [doc] Adapt PTY documentation updates from GH-4167 (GH-27754)
Miss Islington (bot) [Fri, 13 Aug 2021 11:21:06 +0000 (04:21 -0700)] 
bpo-26228: [doc] Adapt PTY documentation updates from GH-4167 (GH-27754)

Co-authored-by: Cornelius Diekmann <c.diekmann@googlemail.com>
(cherry picked from commit dd8eb303b90d63e1f56684bedadca6674bb74a29)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
4 years agoAdded test case based on recommended test cases from RFC 4648 (GH-27747)
Miss Islington (bot) [Fri, 13 Aug 2021 11:15:27 +0000 (04:15 -0700)] 
Added test case based on recommended test cases from RFC 4648 (GH-27747)

(cherry picked from commit 230403a6a19042b174374c3825904d2e857f38b0)

Co-authored-by: andrei kulakov <andrei.avk@gmail.com>
4 years agobpo-44891: Tests `id` preserving on `* 1` for `str` and `bytes` (GH-27745)
Miss Islington (bot) [Fri, 13 Aug 2021 11:04:08 +0000 (04:04 -0700)] 
bpo-44891: Tests `id` preserving on `* 1` for `str` and `bytes` (GH-27745)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit a2ce538e16d5e3a6168704366bdd7a8c5af29881)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
4 years agobpo-44895: Temporarily add an extra gc.collect() call (GH-27746)
Miss Islington (bot) [Fri, 13 Aug 2021 10:21:26 +0000 (03:21 -0700)] 
bpo-44895: Temporarily add an extra gc.collect() call (GH-27746)

This is part of an investigation of a non-deterministic reference leak. While we're looking for the root cause, this is included temporarily so that CI doesn't fail on this particular issue. This enables it to find other regressions in the meantime, which would otherwise be shadowed by our known issue.
(cherry picked from commit 7bf28cbb4bf37fa6bdfc2d3f8a3939066b3f8f22)

Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
4 years ago[3.10] bpo-33930: Fix typo in the test name. (GH-27736)
Benjamin Peterson [Fri, 13 Aug 2021 09:45:13 +0000 (02:45 -0700)] 
[3.10] bpo-33930: Fix typo in the test name. (GH-27736)

[bpo-33930](): Fix typo in the test name. (GH-27733)
(cherry picked from commit f08e6d1bb3c5655f184af88c6793e90908bb6338)

Automerge-Triggered-By: GH:benjaminp
4 years ago[3.10] bpo-44885: Correct the ast locations of f-strings with format specs and repeat...
Pablo Galindo Salgado [Thu, 12 Aug 2021 16:41:21 +0000 (17:41 +0100)] 
[3.10] bpo-44885: Correct the ast locations of f-strings with format specs and repeated expressions (GH-27729) (GH-27743)

(cherry picked from commit 8e832fb2a2cb54d7262148b6ec15563dffb48d63)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
4 years agobpo-26228: Fix pty EOF handling (GH-12049) (GH-27732)
Miss Islington (bot) [Thu, 12 Aug 2021 12:36:04 +0000 (05:36 -0700)] 
bpo-26228: Fix pty EOF handling (GH-12049) (GH-27732)

On non-Linux POSIX platforms, like FreeBSD or macOS,
the FD used to read a forked PTY may signal its exit not
by raising an error but by sending empty data to the read
syscall. This case wasn't handled, leading to hanging
`pty.spawn` calls.

Co-authored-by: Reilly Tucker Siemens <reilly@tuckersiemens.com>
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit 81ab8db235580317edcb0e559cd4c983f70883f5)

Co-authored-by: Zephyr Shannon <geoffpshannon@gmail.com>
4 years agobpo-33479: Add architecture and threading model sections to Tkinter module docs ...
Miss Islington (bot) [Wed, 11 Aug 2021 17:16:10 +0000 (10:16 -0700)] 
bpo-33479: Add architecture and threading model sections to Tkinter module docs (GH-27717)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit 08caf2d5d4a9994976e9eafaf345b5a1a4012a81)

Co-authored-by: Mark Roseman <mark@markroseman.com>
4 years agoAdd .DS_Store on ignore (GH-27711) (GH-27723)
Miss Islington (bot) [Wed, 11 Aug 2021 13:06:43 +0000 (06:06 -0700)] 
Add .DS_Store on ignore (GH-27711) (GH-27723)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit 1841c70f2bdab9d29c1c74a8afffa45d5555af98)

Co-authored-by: 180909 <wjh180909@gmail.com>
4 years agobpo-33930: Fix segfault with deep recursion when cleaning method objects (GH-27678...
Miss Islington (bot) [Wed, 11 Aug 2021 08:32:44 +0000 (01:32 -0700)] 
bpo-33930: Fix segfault with deep recursion when cleaning method objects (GH-27678) (GH-27719)

(cherry picked from commit bfc2d5a5c4550ab3a2fadeb9459b4bd948ff61a2)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
4 years agobpo-44854: Add .editorconfig file to help enforce `make patchcheck` (GH-27638)
Miss Islington (bot) [Tue, 10 Aug 2021 17:06:18 +0000 (10:06 -0700)] 
bpo-44854: Add .editorconfig file to help enforce `make patchcheck` (GH-27638)

(cherry picked from commit c0ab59f7de1906feee21c057ad433fad924d1e38)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
4 years agobpo-14853: add back the stdin test, skip if stdin is redirected (GH-27694)
Miss Islington (bot) [Tue, 10 Aug 2021 14:31:00 +0000 (07:31 -0700)] 
bpo-14853: add back the stdin test, skip if stdin is redirected (GH-27694)

(cherry picked from commit 8ed183391241f0c73e7ba7f42b1d49fc02985f7b)

Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
4 years agobpo-25782: avoid hang in PyErr_SetObject when current exception has a cycle in its...
Miss Islington (bot) [Tue, 10 Aug 2021 13:47:23 +0000 (06:47 -0700)] 
bpo-25782: avoid hang in PyErr_SetObject when current exception has a cycle in its context chain (GH-27626)

Co-authored-by: Dennis Sweeney 36520290+sweeneyde@users.noreply.github.com
(cherry picked from commit d5c217475c4957a8084ac3f92ae012ece5edc7cb)

Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
4 years agomake lib2to3 parse async generators everywhere (GH-6588)
Miss Islington (bot) [Tue, 10 Aug 2021 13:47:11 +0000 (06:47 -0700)] 
make lib2to3 parse async generators everywhere (GH-6588)

(cherry picked from commit 149addd4960d634ce672ab5fc17e0e785a0cdcd0)

Co-authored-by: Zsolt Dollenstein <zsol.zsol@gmail.com>
4 years agobpo-33479: Remove unqualified tkinter threadsafe claim. (GH-6990)
Miss Islington (bot) [Tue, 10 Aug 2021 09:55:08 +0000 (02:55 -0700)] 
bpo-33479: Remove unqualified tkinter threadsafe claim. (GH-6990)

It has not been true for several years and likely never was.
(cherry picked from commit 6b37d0d5300813de31d66df1c77dad7e1027e4d8)

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
4 years agobpo-44872: use new trashcan macros in framobject.c (GH-27683) (GH-27690)
Irit Katriel [Tue, 10 Aug 2021 07:56:14 +0000 (08:56 +0100)] 
bpo-44872: use new trashcan macros in framobject.c (GH-27683) (GH-27690)

4 years agobpo-39498 Start linking the security warnings in the stdlib modules (GH-18272)
Miss Islington (bot) [Tue, 10 Aug 2021 07:51:06 +0000 (00:51 -0700)] 
bpo-39498 Start linking the security warnings in the stdlib modules (GH-18272)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit c5c5326d4799fe4ae566aff32ed3461af95859cc)

Co-authored-by: Anthony Shaw <anthony.p.shaw@gmail.com>
4 years agobpo-41402: Fix email ContentManager calling .encode() on bytes (GH-21631)
Miss Islington (bot) [Mon, 9 Aug 2021 23:44:17 +0000 (16:44 -0700)] 
bpo-41402: Fix email ContentManager calling .encode() on bytes (GH-21631)

(cherry picked from commit b33186bc43bb5aaf652dd9d093a08fdde796d499)

Co-authored-by: Johannes Reiff <mail@jreiff.de>
4 years agobpo-38840: Incorrect __all__ in multiprocessing.managers (GH-18034)
Miss Islington (bot) [Mon, 9 Aug 2021 17:39:05 +0000 (10:39 -0700)] 
bpo-38840: Incorrect __all__ in multiprocessing.managers (GH-18034)

This was causing test___all__ to fail on platforms lacking a shared
memory implementation.

Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit d0978761118856e8ca8ea7b162a6585b8da83df9)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
4 years agobpo-44522: Fix inaccurate information in open() function (GH-27650)
Miss Islington (bot) [Mon, 9 Aug 2021 14:35:11 +0000 (07:35 -0700)] 
bpo-44522: Fix inaccurate information in open() function (GH-27650)

- Use "Low surrogate code units" instead of "Unicode Private Use Area"
(cherry picked from commit b05e9b63fcfcd4bd7a6434fa9f9a7028d12f91c4)

Co-authored-by: meowmeowmeowcat <meowmeowcat1211@gmail.com>
4 years agoRemove unused variable. (GH-27677) (#27680)
Mark Shannon [Mon, 9 Aug 2021 14:25:40 +0000 (15:25 +0100)] 
Remove unused variable. (GH-27677) (#27680)

4 years agobpo-32695: Docs and tests for compresslevel and preset kwargs in tarfile (GH-21470)
Miss Islington (bot) [Mon, 9 Aug 2021 10:30:30 +0000 (03:30 -0700)] 
bpo-32695: Docs and tests for compresslevel and preset kwargs in tarfile (GH-21470)

Co-Authored-By: Bo Bayles <bbayles@gmail.com>
(cherry picked from commit eb2d4a66ff07aa6e51cfaaa31afed31addf76936)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
4 years agobpo-44840: Compiler: Move duplication of exit blocks with no line numbers to after...
Mark Shannon [Mon, 9 Aug 2021 09:54:48 +0000 (10:54 +0100)] 
bpo-44840: Compiler: Move duplication of exit blocks with no line numbers to after CFG optimization. (GH-27656) (#27673)

(cherry picked from commit b854557b49083d8625a433eb36aacb0c87d67c52)

4 years agoUpgrade bundled pip and setuptools (GH-27625)
Miss Islington (bot) [Sat, 7 Aug 2021 16:38:40 +0000 (09:38 -0700)] 
Upgrade bundled pip and setuptools (GH-27625)

pip is now 21.2.3
setuptools is now 57.4.0
(cherry picked from commit 738ac00a08cb6a9d104ec85ccb1a44c2399d6baa)

Co-authored-by: Tzu-ping Chung <uranusjr@gmail.com>
4 years agobpo-44856: Possible reference leak in error paths of update_bases() and __build_class...
Miss Islington (bot) [Sat, 7 Aug 2021 14:03:17 +0000 (07:03 -0700)] 
bpo-44856: Possible reference leak in error paths of update_bases() and __build_class__ (GH-27647)

(cherry picked from commit a40675c659cd8c0699f85ee9ac31660f93f8c2f5)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
4 years agobpo-41576: document BaseException in favor of bare except (GH-21917)
Miss Islington (bot) [Fri, 6 Aug 2021 21:14:40 +0000 (14:14 -0700)] 
bpo-41576: document BaseException in favor of bare except (GH-21917)

(cherry picked from commit e9a6f1b78bf57d9f3f99547bd007d7cfc9724cfb)

Co-authored-by: Thomas Grainger <tagrain@gmail.com>
4 years agobpo-27752: improve documentation of csv.Dialect (GH-26795)
Miss Islington (bot) [Fri, 6 Aug 2021 20:31:49 +0000 (13:31 -0700)] 
bpo-27752: improve documentation of csv.Dialect (GH-26795)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit 0ffdced3b64ba5886fcde64266a31a15712da284)

Co-authored-by: Jack DeVries <58614260+jdevries3133@users.noreply.github.com>
4 years agobpo-44605: Teach @total_ordering() to work with metaclasses (GH-27633) (GH-27640)
Miss Islington (bot) [Fri, 6 Aug 2021 20:11:44 +0000 (13:11 -0700)] 
bpo-44605: Teach @total_ordering() to work with metaclasses (GH-27633) (GH-27640)

4 years agobpo-44756: [docs] revert automated virtual environment creation on `make html` (GH...
Miss Islington (bot) [Fri, 6 Aug 2021 19:15:54 +0000 (12:15 -0700)] 
bpo-44756: [docs] revert automated virtual environment creation on `make html` (GH-27635)

It turned out to be disruptive for downstream distributors.
(cherry picked from commit 55fa87b1ef46bbb9db7612b2dc2dd7fb039d9bc3)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
4 years agobpo-44822: Don't truncate `str`s with embedded NULL chars returned by `sqlite3` UDF...
Miss Islington (bot) [Fri, 6 Aug 2021 17:59:51 +0000 (10:59 -0700)] 
bpo-44822: Don't truncate `str`s with embedded NULL chars returned by `sqlite3` UDF callbacks (GH-27588)

(cherry picked from commit 8f010dc920e1f6dc6a357e7cc1460a7a567c05c6)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
4 years agobpo-40928: notify users running test_decimal on macOS of malloc warnings (GH-26783)
Miss Islington (bot) [Fri, 6 Aug 2021 17:09:06 +0000 (10:09 -0700)] 
bpo-40928: notify users running test_decimal on macOS of malloc warnings (GH-26783)

* When trying to allocate very large regions on macOS, malloc does not   fail silently. It sends a noisy error out to STDERR
* This provides a helper function to warn the user, and provides the warning for test_decimal, which consistently generates these warnings on macOS.

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit 15d3c14df32a35ac69898a7852115722e30d7857)

Co-authored-by: Jack DeVries <58614260+jdevries3133@users.noreply.github.com>
4 years agobpo-44524: Fix an issue wherein `_GenericAlias._name` was not properly set for specia...
Miss Islington (bot) [Fri, 6 Aug 2021 17:08:27 +0000 (10:08 -0700)] 
bpo-44524: Fix an issue wherein `_GenericAlias._name` was not properly set for specialforms (GH-27614)

Co-authored-by: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com>
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit 8bdf12e99a3dc7ada5f85bba79c2a9eb9931f5b0)

Co-authored-by: Bas van Beek <43369155+BvB93@users.noreply.github.com>
4 years agobpo-44849: Fix os.set_inheritable() on FreeBSD 14 with O_PATH (GH-27623)
Miss Islington (bot) [Fri, 6 Aug 2021 13:40:44 +0000 (06:40 -0700)] 
bpo-44849: Fix os.set_inheritable() on FreeBSD 14 with O_PATH (GH-27623)

Fix the os.set_inheritable() function on FreeBSD 14 for file
descriptor opened with the O_PATH flag: ignore the EBADF error on
ioctl(), fallback on the fcntl() implementation.
(cherry picked from commit c24896c0e3b32c8a9f614ef51366007b67d5c665)

Co-authored-by: Victor Stinner <vstinner@python.org>
4 years agobpo-44584: Deprecate PYTHONTHREADDEBUG env var (GH-27065)
Miss Islington (bot) [Fri, 6 Aug 2021 11:32:37 +0000 (04:32 -0700)] 
bpo-44584: Deprecate PYTHONTHREADDEBUG env var (GH-27065)

The threading debug (PYTHONTHREADDEBUG environment variable) is
deprecated in Python 3.10 and will be removed in Python 3.12. This
feature requires a debug build of Python.
(cherry picked from commit 4d77691172aae81bdcbb0ea75839d0e896c43781)

Co-authored-by: Victor Stinner <vstinner@python.org>
4 years agobpo-44679: [doc] fix typo in unittest.mock.rst (GH-27618)
Miss Islington (bot) [Thu, 5 Aug 2021 21:10:14 +0000 (14:10 -0700)] 
bpo-44679: [doc] fix typo in unittest.mock.rst (GH-27618)

(cherry picked from commit 938e84b4fa410f1a86f5e0708ebc3af6bb8efb0e)

Co-authored-by: Jack DeVries <58614260+jdevries3133@users.noreply.github.com>
4 years ago[3.10] bpo-44838: Refine the custom syntax errors for invalid 'if' expressions (GH...
Pablo Galindo Salgado [Thu, 5 Aug 2021 18:00:19 +0000 (19:00 +0100)] 
[3.10] bpo-44838: Refine the custom syntax errors for invalid 'if' expressions (GH-27615). (GH-27616)



(cherry picked from commit f5cbea6b1b5fc39cca377c6cc93f222916015fc4)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
Automerge-Triggered-By: GH:lysnikolaou
4 years agobpo-44801: Check arguments in substitution of ParamSpec in Callable (GH-27585)
Miss Islington (bot) [Wed, 4 Aug 2021 20:36:01 +0000 (13:36 -0700)] 
bpo-44801: Check arguments in substitution of ParamSpec in Callable (GH-27585)

(cherry picked from commit 3875a6954741065b136650db67ac533bc70a3eac)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
4 years agobpo-42958: Improve description of shallow= in filecmp.cmp docs (GH-27166)
Miss Islington (bot) [Wed, 4 Aug 2021 20:03:33 +0000 (13:03 -0700)] 
bpo-42958: Improve description of shallow= in filecmp.cmp docs (GH-27166)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
Co-authored-by: Alexander Vandenbulcke <alexander.vandenbulcke95@gmail.com>
(cherry picked from commit a8dc4893d2b28827e82447326ea47759c161a722)

Co-authored-by: andrei kulakov <andrei.avk@gmail.com>
4 years ago[doc] bpo-43066: zipfile - add note on leading slash in the filename arg (GH-26899)
Miss Islington (bot) [Wed, 4 Aug 2021 19:59:04 +0000 (12:59 -0700)] 
[doc] bpo-43066: zipfile - add note on leading slash in the filename arg (GH-26899)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit 7c5dab4340032eb15d3797d8b601ef11649bbab3)

Co-authored-by: andrei kulakov <andrei.avk@gmail.com>
4 years agoFix typo in 'xml.dom.minidom' documentation (GH-27602)
Miss Islington (bot) [Wed, 4 Aug 2021 19:50:18 +0000 (12:50 -0700)] 
Fix typo in 'xml.dom.minidom' documentation (GH-27602)

(cherry picked from commit cc77193127381be16467ad10f421d3ba147ed972)

Co-authored-by: Cristián Maureira-Fredes <cmaureir@users.noreply.github.com>
4 years agoFix 404 link to the pyporting mailing list (GH-27320)
Miss Islington (bot) [Wed, 4 Aug 2021 19:15:40 +0000 (12:15 -0700)] 
Fix 404 link to the pyporting mailing list (GH-27320)

Co-authored-by: Mariatta Wijaya <Mariatta@users.noreply.github.com>
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit 977d99d1cca6ddd87fe6f218bca46e7ef105bd72)

Co-authored-by: Rohit Nishad <47008599+rohitnishad613@users.noreply.github.com>
4 years agoNote that tp_clear and m_clear are not always called (GH-27581)
Miss Islington (bot) [Wed, 4 Aug 2021 18:23:41 +0000 (11:23 -0700)] 
Note that tp_clear and m_clear are not always called (GH-27581)

(cherry picked from commit 10faada709561663d6b1f623d308ff45e3808cca)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
4 years agoFix hyperlink conflict in turtle docs (GH-27592)
Miss Islington (bot) [Wed, 4 Aug 2021 18:14:12 +0000 (11:14 -0700)] 
Fix hyperlink conflict in turtle docs (GH-27592)

(cherry picked from commit 3d2b4c6f18d7e644e5850d2af74ac5dc530eb24c)

Co-authored-by: Harry <harry.lees@gmail.com>
4 years agobpo-41886: Fix documented type of PyType_Type (GH-22454)
Miss Islington (bot) [Tue, 3 Aug 2021 17:50:24 +0000 (10:50 -0700)] 
bpo-41886: Fix documented type of PyType_Type (GH-22454)

(cherry picked from commit ac811f9b5a68ce8756911ef2c8be83b46696018f)

Co-authored-by: da-woods <dw-git@d-woods.co.uk>
4 years agoEnsure LICENSE.txt file is generated even in PGO builds (GH-27580) (GH-27582)
Steve Dower [Tue, 3 Aug 2021 16:38:04 +0000 (17:38 +0100)] 
Ensure LICENSE.txt file is generated even in PGO builds (GH-27580) (GH-27582)

4 years agobpo-44808: fixes test for interactive inspect getsource of a class (GH-27571)
Miss Islington (bot) [Tue, 3 Aug 2021 13:07:59 +0000 (06:07 -0700)] 
bpo-44808: fixes test for interactive inspect getsource of a class (GH-27571)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit 58325971de0faf330c9c38269dae8315a0746e59)

Co-authored-by: andrei kulakov <andrei.avk@gmail.com>
4 years agobpo-41737: expand doc for NotADirectoryError (GH-27471)
Miss Islington (bot) [Tue, 3 Aug 2021 12:05:04 +0000 (05:05 -0700)] 
bpo-41737: expand doc for NotADirectoryError (GH-27471)

(cherry picked from commit f7c23a99cd4f8179b6ba2cffaeb78b852c0f6488)

Co-authored-by: andrei kulakov <andrei.avk@gmail.com>
4 years agobpo-39091: Fix segfault when Exception constructor returns non-exception for gen...
Miss Islington (bot) [Tue, 3 Aug 2021 10:10:38 +0000 (03:10 -0700)] 
bpo-39091: Fix segfault when Exception constructor returns non-exception for gen.throw. (GH-17658) (GH-27572)

Co-authored-by: Benjamin Peterson <benjamin@python.org>
(cherry picked from commit 83ca46b7784b7357d82ec47b33295e09ed7380cb)

Co-authored-by: Noah <33094578+coolreader18@users.noreply.github.com>
4 years agoPost 3.10.0rc1
Pablo Galindo [Mon, 2 Aug 2021 21:37:13 +0000 (22:37 +0100)] 
Post 3.10.0rc1

4 years agoPython 3.10.0rc1 v3.10.0rc1
Pablo Galindo [Mon, 2 Aug 2021 19:06:40 +0000 (20:06 +0100)] 
Python 3.10.0rc1

4 years agobpo-44792: Improve syntax errors for if expressions (GH-27506) (GH-27565)
Miss Islington (bot) [Mon, 2 Aug 2021 19:05:33 +0000 (12:05 -0700)] 
bpo-44792: Improve syntax errors for if expressions (GH-27506) (GH-27565)

(cherry picked from commit 28b6dc9dd5d1ce6f8aff7e06d4ef9afdc2bc8332)

Co-authored-by: Miguel Brito <5544985+miguendes@users.noreply.github.com>
4 years agobpo-44782: Improve OrderedDict recipe for LRU cache variants (GH-27536)
Miss Islington (bot) [Mon, 2 Aug 2021 18:38:14 +0000 (11:38 -0700)] 
bpo-44782: Improve OrderedDict recipe for LRU cache variants (GH-27536)

(cherry picked from commit 54f185b6d321a6354aef2b2886c766677f487ecb)

Co-authored-by: Raymond Hettinger <rhettinger@users.noreply.github.com>
4 years agobpo-35183: Add typical examples to os.path.splitext docs (GH-27286) (GH-27563)
Miss Islington (bot) [Mon, 2 Aug 2021 18:10:47 +0000 (11:10 -0700)] 
bpo-35183: Add typical examples to os.path.splitext docs (GH-27286) (GH-27563)

(cherry picked from commit aa0894b3792901adb91e5f6d049154b7bcb980ec)

Co-authored-by: Jake Stockwin <jake.stockwin@optimorlabs.com>
4 years agobpo-44785: Silence deprecation warnings in test_pickle (GH-27538)
Miss Islington (bot) [Mon, 2 Aug 2021 17:09:05 +0000 (10:09 -0700)] 
bpo-44785: Silence deprecation warnings in test_pickle (GH-27538)

(cherry picked from commit 36d952d228582b0ffc7a86c520d4ddbe8943d803)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
4 years agobpo-44806: Fix __init__ in subclasses of protocols (GH-27545)
Miss Islington (bot) [Mon, 2 Aug 2021 17:08:59 +0000 (10:08 -0700)] 
bpo-44806: Fix __init__ in subclasses of protocols (GH-27545)

Non-protocol subclasses of protocol ignore now the __init__ method
inherited from protocol base classes.
(cherry picked from commit 043cd60abed09edddc7185bcf7d039771acc734d)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
4 years agoDocument PyMember_GetOne and PyMember_SetOne (GH-27555)
Miss Islington (bot) [Mon, 2 Aug 2021 17:08:49 +0000 (10:08 -0700)] 
Document PyMember_GetOne and PyMember_SetOne (GH-27555)

(cherry picked from commit d382bde220b4c07cce2b924ffeb7525ea1a969f4)

Co-authored-by: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com>
4 years agodoc: "Mac OS " -> "macOS" (GH-27534)
Miss Islington (bot) [Mon, 2 Aug 2021 16:30:05 +0000 (09:30 -0700)] 
doc: "Mac OS " -> "macOS" (GH-27534)

(cherry picked from commit 1342248f3a2b321b7b00867f47c92ba6549f9497)

Co-authored-by: partev <petrosyan@gmail.com>
4 years agobpo-44808: Fix test_inspect in refleak mode (GH-27544)
Miss Islington (bot) [Mon, 2 Aug 2021 13:41:08 +0000 (06:41 -0700)] 
bpo-44808: Fix test_inspect in refleak mode (GH-27544)

(cherry picked from commit 626d397cc1612ea5eef153dd910834c2ee00ddbd)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
4 years agodoc: "Mac OS X" -> "macOS" (GH-27535)
Miss Islington (bot) [Mon, 2 Aug 2021 13:13:48 +0000 (06:13 -0700)] 
doc: "Mac OS X" -> "macOS" (GH-27535)

(cherry picked from commit 414dcb13aaa4fd42f264fdee47782dede5c83d6c)

Co-authored-by: partev <petrosyan@gmail.com>
4 years agobpo-44781: make distutils test suppress deprecation warning from import distutils...
Miss Islington (bot) [Mon, 2 Aug 2021 09:54:52 +0000 (02:54 -0700)] 
bpo-44781: make distutils test suppress deprecation warning from import distutils (GH-27485) (GH-27540)

(cherry picked from commit a9134fa2ffb7e4684c980325dd5444afca596586)

Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
4 years agobpo-44667: Treat correctly lines ending with comments and no newlines in the Python...
Miss Islington (bot) [Mon, 2 Aug 2021 09:43:45 +0000 (02:43 -0700)] 
bpo-44667: Treat correctly lines ending with comments and no newlines in the Python tokenizer (GH-27499) (GH-27500)

(cherry picked from commit b6bde9fc42aecad5be0457198d17cfe7b481ad79)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
4 years agobpo-44793: Fix checking the number of arguments when subscribe a generic type with...
Miss Islington (bot) [Mon, 2 Aug 2021 07:08:24 +0000 (00:08 -0700)] 
bpo-44793: Fix checking the number of arguments when subscribe a generic type with ParamSpec parameter. (GH-27515)

For example Callable[P, T][[int], str, float] will now raise an error.

Use also term "arguments" instead of "parameters" in error
message for too few/many arguments.
(cherry picked from commit f92b9133ef67e77605cbd315b6b6c81036ce110e)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
4 years agoRemove beta release note from macOS installer displays (GH-27531)
Ned Deily [Sun, 1 Aug 2021 21:35:53 +0000 (17:35 -0400)] 
Remove beta release note from macOS installer displays (GH-27531)

4 years agobpo-44784: Apply changes from importlib_metadata 4.6.3 (GH-27508) (#27510)
Miss Islington (bot) [Sun, 1 Aug 2021 03:01:38 +0000 (20:01 -0700)] 
bpo-44784: Apply changes from importlib_metadata 4.6.3 (GH-27508) (#27510)

Addressing issues with tests under error on warnings.

Automerge-Triggered-By: GH:jaraco
(cherry picked from commit 1cf8424a62db38a041d421a46618e025bbb87f89)

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
4 years agobpo-34013: Don't consider a grouped expression when reporting legacy print syntax...
Miss Islington (bot) [Sun, 1 Aug 2021 01:31:44 +0000 (18:31 -0700)] 
bpo-34013: Don't consider a grouped expression when reporting legacy print syntax errors (GH-27521)

(cherry picked from commit 208a7e957b812ad3b3733791845447677a704f3e)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
4 years agobpo-44794: Merge tests for typing.Callable and collection.abc.Callable (GH-27507)
Miss Islington (bot) [Sat, 31 Jul 2021 17:25:22 +0000 (10:25 -0700)] 
bpo-44794: Merge tests for typing.Callable and collection.abc.Callable (GH-27507)

(cherry picked from commit be4cb9089aaf58d5f90da5f9fa66dc3c6763b5a2)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
4 years agoTrivial typo in docstring (#27504)
Miss Islington (bot) [Sat, 31 Jul 2021 05:04:45 +0000 (22:04 -0700)] 
Trivial typo in docstring (#27504)

(cherry picked from commit 4b4227b907a262446b9d276c274feda2590a4e6e)

Co-authored-by: Jesús Cea <jcea@jcea.es>
Co-authored-by: Jesús Cea <jcea@jcea.es>
4 years agobpo-44648: Fix error type in inspect.getsource() in interactive session (GH-27171...
Miss Islington (bot) [Fri, 30 Jul 2021 17:46:42 +0000 (10:46 -0700)] 
bpo-44648: Fix error type in inspect.getsource() in interactive session (GH-27171) (GH-27495)

(cherry picked from commit 48a62559dfaf775e4f1cc56b19379c799e8e2587)

Co-authored-by: andrei kulakov <andrei.avk@gmail.com>
4 years agobpo-43625: Enhance csv sniffer has_headers() to be more accurate (GH-26939) (GH-27494)
Miss Islington (bot) [Fri, 30 Jul 2021 17:30:09 +0000 (10:30 -0700)] 
bpo-43625: Enhance csv sniffer has_headers() to be more accurate (GH-26939) (GH-27494)

(cherry picked from commit ceea579ccc51791f3e115155d6f27905bc7544a9)

Co-authored-by: andrei kulakov <andrei.avk@gmail.com>
4 years agobpo-42892: fix email multipart attribute error (GH-26903) (GH-27492)
Miss Islington (bot) [Fri, 30 Jul 2021 17:27:06 +0000 (10:27 -0700)] 
bpo-42892: fix email multipart attribute error (GH-26903) (GH-27492)

(cherry picked from commit e3f877c32d7cccb734f45310f26beeec793364ce)

Co-authored-by: andrei kulakov <andrei.avk@gmail.com>
4 years agobpo-41911: Update docs for various expressions (GH-27470) (GH-27490)
Miss Islington (bot) [Fri, 30 Jul 2021 17:25:45 +0000 (10:25 -0700)] 
bpo-41911: Update docs for various expressions (GH-27470) (GH-27490)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit 4bd9caafb64589288e5171087070bde726178c58)

Co-authored-by: andrei kulakov <andrei.avk@gmail.com>
4 years agobpo-44666: Use default encoding as fallback for compile_file (GH-27236) (GH-27488)
Miss Islington (bot) [Fri, 30 Jul 2021 17:12:05 +0000 (10:12 -0700)] 
bpo-44666: Use default encoding as fallback for compile_file (GH-27236) (GH-27488)

When sys.stdout.encoding is None compile_file will fall back to
sys.getdefaultencoding to encode/decode error messages.

Co-authored-by: Stefan Hoelzl <stefan.hoelzl@posteo.de>
Co-authored-by: Mickaël Schoentgen <contact@tiger-222.fr>
(cherry picked from commit 80f07076294bc09a55ed76d9bbf307404eef25e6)

4 years agobpo-44753: Don't use logfile extension when determining old files to be deleted ...
Miss Islington (bot) [Fri, 30 Jul 2021 16:20:59 +0000 (09:20 -0700)] 
bpo-44753: Don't use logfile extension when determining old files to be deleted (GH-27475) (GH-27487)

(cherry picked from commit 6ff890380971752299325bd28eab80ec936975cf)

4 years ago[3.10] Fail the CI if an optional module fails to compile (GH-27466). (GH-27481)
Pablo Galindo Salgado [Fri, 30 Jul 2021 15:14:28 +0000 (16:14 +0100)] 
[3.10] Fail the CI if an optional module fails to compile (GH-27466). (GH-27481)

(cherry picked from commit 7cad0bee80a536c7e47f54cf43174175834f30a0)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
4 years agoUpdate URLs in comments and metadata to use HTTPS (GH-27458) (GH-27478)
Miss Islington (bot) [Fri, 30 Jul 2021 14:25:28 +0000 (07:25 -0700)] 
Update URLs in comments and metadata to use HTTPS (GH-27458) (GH-27478)

(cherry picked from commit be42c06bb01206209430f3ac08b72643dc7cad1c)

Co-authored-by: Noah Kantrowitz <noah@coderanger.net>
4 years agoDoc: Change errant 3.10.0 to 3.10, to match other mentions (GH-27459) (GH-27479)
Miss Islington (bot) [Fri, 30 Jul 2021 14:16:46 +0000 (07:16 -0700)] 
Doc: Change errant 3.10.0 to 3.10, to match other mentions (GH-27459) (GH-27479)

(cherry picked from commit f4367ba3c533fc2dc9e32aa431d674f715b911f2)

Co-authored-by: Ori Avtalion <ori@avtalion.name>
4 years agobpo-44761: Change default value of NewType __module__ attr (GH-27406) (GH-27477)
Miss Islington (bot) [Fri, 30 Jul 2021 13:48:01 +0000 (06:48 -0700)] 
bpo-44761: Change default value of NewType __module__ attr (GH-27406) (GH-27477)

(cherry picked from commit 7b975f81e4dba70a42c6279539a7fcfe4211b4c0)

Co-authored-by: Yurii Karabas <1998uriyyo@gmail.com>
4 years ago[3.10] bpo-31746: Prevent segfaults when sqlite3.Connection is uninitialised (GH...
Erlend Egeberg Aasland [Fri, 30 Jul 2021 12:01:22 +0000 (14:01 +0200)] 
[3.10] bpo-31746: Prevent segfaults when sqlite3.Connection is uninitialised (GH-27431). (GH-27472)

(cherry picked from commit 7e311e496b0e26b3d3c62fe9b0ed2a4677c37ee9)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
4 years agobpo-44662: Add ability to annotate types.Union (GH-27214) (GH-27461)
Miss Islington (bot) [Fri, 30 Jul 2021 09:31:54 +0000 (02:31 -0700)] 
bpo-44662: Add ability to annotate types.Union (GH-27214) (GH-27461)

Co-authored-by: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com>
(cherry picked from commit 8182c8329c709f42218a8a17d81639ece5b7b627)

Co-authored-by: Yurii Karabas <1998uriyyo@gmail.com>
4 years agobpo-44479: Do not regenerate files during a PGO build as it will invalidate the profi...
Steve Dower [Thu, 29 Jul 2021 22:18:17 +0000 (23:18 +0100)] 
bpo-44479: Do not regenerate files during a PGO build as it will invalidate the profile. (GH-27462)

Also remove some unused code that should not have been backported.

4 years agoAdd missing gdbm dependencies to the UNIX CI (GH-27467)
Miss Islington (bot) [Thu, 29 Jul 2021 22:01:07 +0000 (15:01 -0700)] 
Add missing gdbm dependencies to the UNIX CI (GH-27467)

(cherry picked from commit 851cca8c22795a2f143ad5ebc10adab3c7784ad0)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
4 years agoFix typo in ast.rst (GH-27449) (GH-27454)
Miss Islington (bot) [Thu, 29 Jul 2021 17:38:28 +0000 (10:38 -0700)] 
Fix typo in ast.rst (GH-27449) (GH-27454)

Co-authored-by: HaeckelK <haeckelk.github@gmail.com>
(cherry picked from commit 6b61d74a3bab43a44fa47b1facd1bec3d74e12b1)

Co-authored-by: HaeckelK <51128712+HaeckelK@users.noreply.github.com>
4 years agoTo fix the random failed test cases of test___xxsubinterpreters in multiprocess....
Miss Islington (bot) [Thu, 29 Jul 2021 17:27:24 +0000 (10:27 -0700)] 
To fix the random failed test cases of test___xxsubinterpreters in multiprocess. (GH-27240) (GH-27452)

(cherry picked from commit 9101b39e67c2437e88c0ad6b57aafd48ab08d431)

Co-authored-by: Hai Shi <shihai1992@gmail.com>
4 years agobpo-44765: [doc] fix typo (GH-27430) (GH-27450)
Miss Islington (bot) [Thu, 29 Jul 2021 17:22:57 +0000 (10:22 -0700)] 
bpo-44765: [doc] fix typo (GH-27430) (GH-27450)

(cherry picked from commit ccefa8a905c797e4a60078d5e1de846f929c6928)

Co-authored-by: Pavel <69010336+pavel-lexyr@users.noreply.github.com>
4 years agobpo-44752: refactor part of rlcompleter.Completer.attr_matches (GH-27433) (GH-27447)
Miss Islington (bot) [Thu, 29 Jul 2021 15:44:42 +0000 (08:44 -0700)] 
bpo-44752: refactor part of rlcompleter.Completer.attr_matches (GH-27433) (GH-27447)

(cherry picked from commit 6741794dd420c6b9775a188690dbf265037cd69f)

Co-authored-by: Jack DeVries <58614260+jdevries3133@users.noreply.github.com>
4 years agobpo-32280: Store _PyRuntime in a named section (GH-4802) (#27448)
Miss Islington (bot) [Thu, 29 Jul 2021 15:20:58 +0000 (08:20 -0700)] 
bpo-32280: Store _PyRuntime in a named section (GH-4802) (#27448)

This commit stores the _PyRuntime structure in a section of the same name. This allows a debugging or crash reporting tool to quickly locate this structure at runtime without requiring the symbol table.

Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
(cherry picked from commit 35002aa8f62dda1f79035e9904abdf476683e9be)

Co-authored-by: Max Bélanger <aeromax@gmail.com>
Co-authored-by: Max Bélanger <aeromax@gmail.com>
4 years agobpo-44752: Make rlcompleter not call `@property` methods (GH-27401) (GH-27444)
Miss Islington (bot) [Thu, 29 Jul 2021 12:07:00 +0000 (05:07 -0700)] 
bpo-44752: Make rlcompleter not call `@property` methods (GH-27401) (GH-27444)

* rlcompleter was calling these methods to identify whether to add
  parenthesis to the completion, based on if the attribute is callable.
* for property objects, completion with parenthesis are never desirable.
* property methods with print statements behaved very strangely, which
  was especially unfriendly to language newcomers. <tab> could suddenly
  produce output unexpectedly.
(cherry picked from commit 50de8f74f8e92b20e76438c22b6a8f91afd6df75)

Co-authored-by: Jack DeVries <58614260+jdevries3133@users.noreply.github.com>
4 years agobpo-44707: Fix an undefined behavior of the null pointer arithmetic (GH-27292) (GH...
Miss Islington (bot) [Thu, 29 Jul 2021 12:05:30 +0000 (05:05 -0700)] 
bpo-44707: Fix an undefined behavior of the null pointer arithmetic (GH-27292) (GH-27442)

(cherry picked from commit e5c8ddb1714fb51ab1defa24352c98e0f01205dc)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
4 years agobpo-41103: Resurrect the old buffer protocol. (GH-27437) (GH-27441)
Miss Islington (bot) [Thu, 29 Jul 2021 11:31:42 +0000 (04:31 -0700)] 
bpo-41103: Resurrect the old buffer protocol. (GH-27437) (GH-27441)

Revert "bpo-41103: Remove old buffer protocol support (GH-21117)"

This reverts commit 6f8a6ee59cb7f99f68df8ee9c3e8c8cf19af3eed.
(cherry picked from commit ce5e1a6809b714eb0383219190a076d9f883e008)

Co-authored-by: Inada Naoki <songofacandy@gmail.com>
4 years agobpo-43565: Document PyUnicode_KIND's return type as an unsigned int (GH-25724) (GH...
Miss Islington (bot) [Thu, 29 Jul 2021 09:31:02 +0000 (02:31 -0700)] 
bpo-43565: Document PyUnicode_KIND's return type as an unsigned int (GH-25724) (GH-27439)

(cherry picked from commit 47fd4726a2ce8599cc397ddeae40f70eb471e868)

Co-authored-by: Ammar Askar <ammar@ammaraskar.com>
4 years ago[3.10] bpo-43897: Reject "_" captures and top-level MatchStar in the AST validator...
Miss Islington (bot) [Thu, 29 Jul 2021 01:02:14 +0000 (18:02 -0700)] 
[3.10] bpo-43897: Reject "_" captures and top-level MatchStar in the AST validator (GH-27432) (GH-27435)

(cherry picked from commit 8d0647485db5af2a0f0929d6509479ca45f1281b)

Co-authored-by: Brandt Bucher <brandt@python.org>
Automerge-Triggered-By: GH:brandtbucher
4 years agobpo-40263: Fixes an off-by-one error in _winapi_WaitForMultipleObjects_impl (GH-19501)
Miss Islington (bot) [Wed, 28 Jul 2021 20:18:01 +0000 (13:18 -0700)] 
bpo-40263: Fixes an off-by-one error in _winapi_WaitForMultipleObjects_impl (GH-19501)

(cherry picked from commit 92b5dc780db968f6277f42cb06926dddb7475dc6)

Co-authored-by: Ray Donnelly <mingw.android@gmail.com>
4 years agobpo-44763: [doc] remove repetitive sentence from textwrap.wrap (GH-27423) (GH-27426)
Miss Islington (bot) [Wed, 28 Jul 2021 17:30:58 +0000 (10:30 -0700)] 
bpo-44763: [doc] remove repetitive sentence from textwrap.wrap (GH-27423) (GH-27426)

(cherry picked from commit cb1d76f10ab33dddd0dbd64e6506bf7c065d499b)

Co-authored-by: Jack DeVries <58614260+jdevries3133@users.noreply.github.com>
4 years agobpo-44544: [doc] list all textwrap func kwargs (GH-26999) (GH-27424)
Miss Islington (bot) [Wed, 28 Jul 2021 17:29:25 +0000 (10:29 -0700)] 
bpo-44544: [doc] list all textwrap func kwargs (GH-26999) (GH-27424)

(cherry picked from commit c1e39d6b1167376fdaf3f288ba9a689e61c7fdd1)

Co-authored-by: Jack DeVries <58614260+jdevries3133@users.noreply.github.com>
4 years agobpo-27827: identify a greater range of reserved filename on Windows. (GH-26698) ...
Miss Islington (bot) [Wed, 28 Jul 2021 15:01:47 +0000 (08:01 -0700)] 
bpo-27827: identify a greater range of reserved filename on Windows. (GH-26698) (GH-27421)

`pathlib.PureWindowsPath.is_reserved()` now identifies as reserved
filenames with trailing spaces or colons.

Co-authored-by: Barney Gale <barney.gale@foundry.com>
Co-authored-by: Eryk Sun <eryksun@gmail.com>
(cherry picked from commit 56c1f6d7edad454f382d3ecb8cdcff24ac898a50)