]> git.ipfire.org Git - thirdparty/Python/cpython.git/log
thirdparty/Python/cpython.git
5 years agobpo-40791: Make compare_digest more constant-time. (GH-23438)
Miss Islington (bot) [Sun, 22 Nov 2020 17:33:09 +0000 (09:33 -0800)] 
bpo-40791: Make compare_digest more constant-time. (GH-23438)

The existing volatile `left`/`right` pointers guarantee that the reads will all occur, but does not guarantee that they will be _used_. So a compiler can still short-circuit the loop, saving e.g. the overhead of doing the xors and especially the overhead of the data dependency between `result` and the reads. That would change performance depending on where the first unequal byte occurs. This change removes that optimization.

(This is change GH-1 from https://bugs.python.org/issue40791 .)
(cherry picked from commit 31729366e2bc09632e78f3896dbce0ae64914f28)

Co-authored-by: Devin Jeanpierre <jeanpierreda@google.com>
5 years ago[3.7] bpo-42336: Improve PCbuild batch files (GH-23325) (GH-23373)
Steve Dower [Wed, 18 Nov 2020 18:01:52 +0000 (18:01 +0000)] 
[3.7] bpo-42336: Improve PCbuild batch files (GH-23325) (GH-23373)

* bpo-42336: Improve PCbuild batch files (GH-23325)

* Remove ARM platforms

5 years ago[3.7] bpo-42103: Improve validation of Plist files. (GH-22882) (#23117)
Serhiy Storchaka [Tue, 10 Nov 2020 19:54:15 +0000 (21:54 +0200)] 
[3.7] bpo-42103: Improve validation of Plist files. (GH-22882) (#23117)

* Prevent some possible DoS attacks via providing invalid Plist files
  with extremely large number of objects or collection sizes.
* Raise InvalidFileException for too large bytes and string size instead of returning garbage.
* Raise InvalidFileException instead of ValueError for specific invalid datetime (NaN).
* Raise InvalidFileException instead of TypeError for non-hashable dict keys.
* Add more tests for invalid Plist files..
(cherry picked from commit 34637a0ce21e7261b952fbd9d006474cc29b681f)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
5 years ago[3.7] Remove 3.5 from Doc version switcher in master. (GH-22886) (#22890)
larryhastings [Thu, 22 Oct 2020 14:30:11 +0000 (07:30 -0700)] 
[3.7] Remove 3.5 from Doc version switcher in master. (GH-22886) (#22890)

(cherry picked from commit 283f9a253b4ff4df728558205629b3bb3af6e47f)

5 years agobpo-41944: No longer call eval() on content received via HTTP in the CJK codec tests...
Miss Skeleton (bot) [Tue, 20 Oct 2020 02:38:40 +0000 (19:38 -0700)] 
bpo-41944: No longer call eval() on content received via HTTP in the CJK codec tests (GH-22566) (GH-22578)

(cherry picked from commit 2ef5caa58febc8968e670e39e3d37cf8eef3cab8)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
5 years agobpo-42051: Reject XML entity declarations in plist files (#22760) (GH-22801)
Ned Deily [Tue, 20 Oct 2020 02:36:27 +0000 (22:36 -0400)] 
bpo-42051: Reject XML entity declarations in plist files (#22760) (GH-22801)

Co-authored-by: Ronald Oussoren <ronaldoussoren@mac.com>
5 years ago[3.7] bpo-41976: Fix the fallback to gcc of ctypes.util.find_library when using gcc...
Pablo Galindo [Thu, 8 Oct 2020 18:50:37 +0000 (19:50 +0100)] 
[3.7] bpo-41976: Fix the fallback to gcc of ctypes.util.find_library when using gcc>9 (GH-22598). (GH-22601)

(cherry picked from commit 27ac19cca2c639caaf6fedf3632fe6beb265f24f)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
5 years agoPost release updates
Ned Deily [Mon, 17 Aug 2020 22:18:11 +0000 (18:18 -0400)] 
Post release updates

5 years ago3.7.9 v3.7.9
Ned Deily [Sat, 15 Aug 2020 05:20:16 +0000 (01:20 -0400)] 
3.7.9

5 years agobpo-41100: additional fixes for testing on macOS 11 Big Sur Intel
Ned Deily [Sat, 15 Aug 2020 03:48:14 +0000 (23:48 -0400)] 
bpo-41100: additional fixes for testing on macOS 11 Big Sur Intel

Note: macOS 11 is not yet released, this release of Python is not
fully supported on 11.0, and not all tests pass.

5 years agobpo-33786: Fix asynchronous generators to handle GeneratorExit in athrow() (GH-7467...
Miss Islington (bot) [Fri, 14 Aug 2020 09:44:00 +0000 (02:44 -0700)] 
bpo-33786: Fix asynchronous generators to handle GeneratorExit in athrow() (GH-7467) (GH-21878)

(cherry picked from commit 52698c7ad9eae9feb35839fde17a7d1da8036a9b)

Co-authored-by: Yury Selivanov <yury@magic.io>
5 years agobpo-41455: Provide a link to how the third generation is collected in the GC docs...
Miss Islington (bot) [Wed, 12 Aug 2020 10:53:13 +0000 (03:53 -0700)] 
bpo-41455: Provide a link to how the third generation is collected in the GC docs (GH-21703) (GH-21788)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
(cherry picked from commit 82ca8fada15b121866530f2cdac1b7055be4a244)

Co-authored-by: Yaroslav Pankovych <31005942+P-Alban@users.noreply.github.com>
5 years agobpo-41475: Fix note in "What's new in 3.7" (GH-21733) (GH-21835)
Miss Islington (bot) [Wed, 12 Aug 2020 10:36:20 +0000 (03:36 -0700)] 
bpo-41475: Fix note in "What's new in 3.7" (GH-21733) (GH-21835)

(cherry picked from commit 76643c10ede2813ca921464fe839e81caee21a84)

Co-authored-by: Ram Rachum <ram@rachum.com>
5 years agobpo-39603: Prevent header injection in http methods (GH-18485) (GH-21538)
Miss Islington (bot) [Sun, 19 Jul 2020 09:27:35 +0000 (02:27 -0700)] 
bpo-39603: Prevent header injection in http methods (GH-18485) (GH-21538)

reject control chars in http method in http.client.putrequest to prevent http header injection
(cherry picked from commit 8ca8a2e8fb068863c1138f07e3098478ef8be12e)

Co-authored-by: AMIR <31338382+amiremohamadi@users.noreply.github.com>
5 years agobpo-41304: Update NEWS to include CVE-2020-15801 reference (GH-21521) (GH-21524)
Miss Islington (bot) [Sat, 18 Jul 2020 09:00:57 +0000 (02:00 -0700)] 
bpo-41304: Update NEWS to include CVE-2020-15801 reference (GH-21521) (GH-21524)

(cherry picked from commit 164b04c47e61bd35d55e61bc74f9fd646eba81bb)

Co-authored-by: Steve Dower <steve.dower@python.org>
5 years agobpo-41304: Ensure python3x._pth is loaded on Windows (GH-21495) (#21499)
Steve Dower [Wed, 15 Jul 2020 22:24:56 +0000 (23:24 +0100)] 
bpo-41304: Ensure python3x._pth is loaded on Windows (GH-21495) (#21499)

5 years agobpo-39017: Avoid infinite loop in the tarfile module (GH-21454) (GH-21484)
Miss Islington (bot) [Wed, 15 Jul 2020 12:35:08 +0000 (05:35 -0700)] 
bpo-39017: Avoid infinite loop in the tarfile module (GH-21454) (GH-21484)

Avoid infinite loop when reading specially crafted TAR files using the tarfile module
(CVE-2019-20907).
(cherry picked from commit 5a8d121a1f3ef5ad7c105ee378cc79a3eac0c7d4)

Co-authored-by: Rishi <rishi_devan@mail.com>
5 years agobpo-41288: Fix a crash in unpickling invalid NEWOBJ_EX. (GH-21458) (GH-21461)
Miss Islington (bot) [Mon, 13 Jul 2020 18:17:01 +0000 (11:17 -0700)] 
bpo-41288: Fix a crash in unpickling invalid NEWOBJ_EX. (GH-21458) (GH-21461)

Automerge-Triggered-By: @tiran
(cherry picked from commit 4f309abf55f0e6f8950ac13d6ec83c22b8d47bf8)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
5 years agocloses bpo-41235: Fix the error handling in SSLContext.load_dh_params() (GH-21389)
Miss Islington (bot) [Wed, 8 Jul 2020 04:55:36 +0000 (21:55 -0700)] 
closes bpo-41235: Fix the error handling in SSLContext.load_dh_params() (GH-21389)

(cherry picked from commit aebc0495572c5bb85d2bd97d27cf93ab038b5a6a)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
5 years ago[3.7] bpo-29778: Ensure python3.dll is loaded from correct locations when Python...
Steve Dower [Mon, 6 Jul 2020 17:24:59 +0000 (18:24 +0100)] 
[3.7] bpo-29778: Ensure python3.dll is loaded from correct locations when Python is embedded (GH-21297) (#21298)

* bpo-29778: Ensure python3.dll is loaded from correct locations when Python is embedded.

* Add CVE number

5 years ago[3.7] bpo-41004: Resolve hash collisions for IPv4Interface and IPv6Interface (GH...
Tapas Kundu [Tue, 30 Jun 2020 19:20:21 +0000 (00:50 +0530)] 
[3.7] bpo-41004: Resolve hash collisions for IPv4Interface and IPv6Interface (GH-21033) (GH-21231)

CVE-2020-14422
The __hash__() methods of classes IPv4Interface and IPv6Interface had issue
of generating constant hash values of 32 and 128 respectively causing hash collisions.
The fix uses the hash() function to generate hash values for the objects
instead of XOR operation
(cherry picked from commit b30ee26e366bf509b7538d79bfec6c6d38d53f28)

Co-authored-by: Ravi Teja P <rvteja92@gmail.com>
Signed-off-by: Tapas Kundu <tkundu@vmware.com>
5 years agoPost release updates
Ned Deily [Sun, 28 Jun 2020 11:19:53 +0000 (07:19 -0400)] 
Post release updates

5 years ago3.7.8 v3.7.8
Ned Deily [Sat, 27 Jun 2020 08:35:53 +0000 (04:35 -0400)] 
3.7.8

5 years agoBPO-41100: Support macOS 11 when building (GH-21113) (GH-21155)
Miss Islington (bot) [Thu, 25 Jun 2020 15:15:52 +0000 (08:15 -0700)] 
BPO-41100: Support macOS 11 when building (GH-21113) (GH-21155)

(cherry picked from commit 8ea6353f60625c96ce96588c70ff24a77f8c71f9)

Co-authored-by: Ronald Oussoren <ronaldoussoren@mac.com>
5 years ago[3.7] bpo-41009: fix requires_OS_version() class decorator (GH-20942) (GH-20949)
Christian Heimes [Thu, 25 Jun 2020 12:11:13 +0000 (14:11 +0200)] 
[3.7] bpo-41009: fix requires_OS_version() class decorator (GH-20942) (GH-20949)

Signed-off-by: Christian Heimes <christian@python.org>
Automerge-Triggered-By: @tiran.
(cherry picked from commit bb6ec14479f18c32e71e43f2785f177aa17aabbd)

Co-authored-by: Christian Heimes <christian@python.org>
5 years agoUpdate macOS installer reader for 3.7.8
Ned Deily [Thu, 25 Jun 2020 10:27:57 +0000 (06:27 -0400)] 
Update macOS installer reader for 3.7.8

5 years agoFix macOS installer build typos
Ned Deily [Thu, 25 Jun 2020 07:41:19 +0000 (03:41 -0400)] 
Fix macOS installer build typos

5 years agoPost release update
Ned Deily [Thu, 18 Jun 2020 03:49:37 +0000 (23:49 -0400)] 
Post release update

5 years ago3.7.8rc1 v3.7.8rc1
Ned Deily [Wed, 17 Jun 2020 08:48:12 +0000 (04:48 -0400)] 
3.7.8rc1

5 years agobpo-40204: Pin Sphinx version to 2.3.1 in Doc/Makefile
Ned Deily [Wed, 17 Jun 2020 08:27:55 +0000 (04:27 -0400)] 
bpo-40204: Pin Sphinx version to 2.3.1 in Doc/Makefile

5 years agoUpdate missed Python.app copyright.
Ned Deily [Wed, 17 Jun 2020 07:49:24 +0000 (03:49 -0400)] 
Update missed Python.app copyright.

5 years agoUpdate macOS Python Launcher defaults to python3.
Ned Deily [Wed, 17 Jun 2020 07:33:05 +0000 (03:33 -0400)] 
Update macOS Python Launcher defaults to python3.

5 years agobpo-39580: add check for CLI installation on macOS
Ned Deily [Wed, 17 Jun 2020 07:18:55 +0000 (03:18 -0400)] 
bpo-39580: add check for CLI installation on macOS

Adds a simple check for whether or not the package is being installed in the GUI or using installer on the command line. This addresses an issue where CLI-based software management tools (such as Munki) unexpectedly open Finder windows into a GUI session during installation runs.

5 years agoUpdate the macOS installer build scripts
Ned Deily [Wed, 17 Jun 2020 04:19:32 +0000 (00:19 -0400)] 
Update the macOS installer build scripts
Change includes to fix building with Python 3.x and to
build correctly on newer macOS systems with SIP.

5 years agoSynchronize macOS installer with 3.9
Ned Deily [Wed, 17 Jun 2020 01:57:09 +0000 (21:57 -0400)] 
Synchronize macOS installer with 3.9

5 years agobpo-38488: Upgrade bundled versions of pip & setuptools (GH-20491) (GH-20900)
Miss Islington (bot) [Mon, 15 Jun 2020 22:01:19 +0000 (15:01 -0700)] 
bpo-38488: Upgrade bundled versions of pip & setuptools (GH-20491) (GH-20900)

Co-authored-by: Xavier Fernandez <xav.fernandez@gmail.com>
(cherry picked from commit e63cc2f64668bd1d4581f8efa7089af7e08863b8)

Co-authored-by: Ned Deily <nad@python.org>
5 years agobpo-40448: ensurepip: Do not use cache (GH-19812)
Miss Islington (bot) [Mon, 15 Jun 2020 17:44:34 +0000 (10:44 -0700)] 
bpo-40448: ensurepip: Do not use cache (GH-19812)

ensurepip optionally installs or upgrades 'pip' and 'setuptools' using
the version of those modules bundled with Python.  The internal PIP
installation routine by default temporarily uses its cache, if it
exists.  This is undesirable as Python builds and installations may be
independent of the user running the build, whilst PIP cache location
is dependent on the user's environment and outside of the build
environment.

At the same time, there's no value in using the cache while installing
bundled modules.

This change disables PIP caching when used in ensurepip.
(cherry picked from commit 4a3a682b12f93a03888e8b59f439bc5fe30d6055)

Co-authored-by: Krzysztof Konopko <kkonopko@users.noreply.github.com>
5 years ago[3.7] bpo-34226: fix cgi.parse_multipart without content_length (GH-8530) (GH-20892)
Miss Islington (bot) [Mon, 15 Jun 2020 15:33:32 +0000 (08:33 -0700)] 
[3.7] bpo-34226: fix cgi.parse_multipart without content_length (GH-8530) (GH-20892)

In Python 3.7 the behavior of parse_multipart changed requiring CONTENT-LENGTH
header, this fix remove this header as required and fix FieldStorage
read_lines_to_outerboundary, by not using limit when it's negative,
since by default it's -1 if not content-length and keeps substracting what
was read from the file object.

Also added a test case for this problem.
(cherry picked from commit d8cf3514dd4682419a66f6e834bb384ee34afc95)

Co-authored-by: roger <rogerduran@gmail.com>
Automerge-Triggered-By: @ned-deily
5 years ago[3.7] bpo-37674: Tweak imp module deprecation note in the docs (GH-20480) (GH-20861)
Miss Islington (bot) [Sat, 13 Jun 2020 20:56:10 +0000 (13:56 -0700)] 
[3.7] bpo-37674: Tweak imp module deprecation note in the docs (GH-20480) (GH-20861)

(cherry picked from commit dea3223740127ac13f984c1d38f127ab6701af44)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
Automerge-Triggered-By: @brettcannon
5 years agobpo-40164: Update Windows OpenSSL to 1.1.1g (GH-20834)
Steve Dower [Fri, 12 Jun 2020 21:15:27 +0000 (22:15 +0100)] 
bpo-40164: Update Windows OpenSSL to 1.1.1g (GH-20834)

Co-authored-by: Srinivas Reddy Thatiparthy (శ్రీనివాస్ రెడ్డి తాటిపర్తి) <thatiparthysreenivas@gmail.com>
5 years agobpo-40964: disable remote IMAP tests (GH-20836)
Christian Heimes [Fri, 12 Jun 2020 18:54:03 +0000 (20:54 +0200)] 
bpo-40964: disable remote IMAP tests (GH-20836)

Remote host cyrus.andrew.cmu.edu is blocking incoming connections and is
causing test suite to fail.

Signed-off-by: Christian Heimes <christian@python.org>
5 years agobpo-40025: Require _generate_next_value_ to be defined before members (GH-19762)
Miss Islington (bot) [Thu, 11 Jun 2020 21:48:47 +0000 (14:48 -0700)] 
bpo-40025: Require _generate_next_value_ to be defined before members (GH-19762)

require `_generate_next_value_` to be defined before members
(cherry picked from commit d9a43e20facdf4ad10186f820601c6580e1baa80)

5 years agobpo-29620: iterate over a copy of sys.modules (GH-4800) (GH-20817)
Miss Islington (bot) [Thu, 11 Jun 2020 18:34:42 +0000 (11:34 -0700)] 
bpo-29620: iterate over a copy of sys.modules (GH-4800) (GH-20817)

unittest.TestCase.assertWarns no longer raises a RuntimeException
when accessing a module's ``__warningregistry__`` causes importation of a new
module, or when a new module is imported in another thread.
(cherry picked from commit 46398fba4d66ad342cf2504ef947b5fb857423b2)

Co-authored-by: kernc <kerncece@gmail.com>
5 years ago[3.7] bpo-40895: Update weakref documentation to remove old warnings (GH-20687) ...
Antoine Pitrou [Wed, 10 Jun 2020 20:37:21 +0000 (22:37 +0200)] 
[3.7] bpo-40895: Update weakref documentation to remove old warnings (GH-20687) (GH-20793)

The doccumentation at https://docs.python.org/3.10/library/weakref.html cautions that the `WeakKeyDictionary` and `WeakValueDictionary` are susceptible to the problem of dictionary mutation during iteration.

These notes present the user with a problem that has no easy solution.

I dug into the implementation and found that fortunately, Antoine Pitrou already addressed this challenge (10 years ago!) by introducing an `_IterationGuard` context manager to the implementation, which delays mutation while an iteration is in progress.

I asked for confirmation and @pitrou agreed that these notes could be removed:
https://github.com/python/cpython/commit/c1baa601e2b558deb690edfdf334fceee3b03327GH-commitcomment-39514438.
(cherry picked from commit 1642c0ef750f96664a98cadb09301d492098d2fb)

Co-authored-by: Daniel Fortunov <asqui@users.noreply.github.com>
Automerge-Triggered-By: @pitrou
5 years agoAdd quotes to code to be a string
Miss Islington (bot) [Tue, 9 Jun 2020 12:39:01 +0000 (05:39 -0700)] 
Add quotes to code to be a string

5 years ago[3.7] Revert bpo-39576: Prevent memory error for overly optimistic precisions (GH...
Stefan Krah [Mon, 8 Jun 2020 23:55:47 +0000 (01:55 +0200)] 
[3.7] Revert bpo-39576: Prevent memory error for overly optimistic precisions (GH-20748)

This reverts commit c6f95543b4832c3f0170179da39bcf99b40a7aa8.

5 years ago[3.7] Revert bpo-39576: docs: set context for decimal arbitrary precision arithmetic...
Stefan Krah [Mon, 8 Jun 2020 23:34:03 +0000 (01:34 +0200)] 
[3.7] Revert bpo-39576: docs: set context for decimal arbitrary precision arithmetic (GH-20746)

This reverts commit 00e45877e33d32bb61aa13a2033e3bba370bda4d.

5 years ago[3.7] Revert bpo-39576: Clarify the word size for the 32-bit build. (GH-20744)
Stefan Krah [Mon, 8 Jun 2020 23:22:03 +0000 (01:22 +0200)] 
[3.7] Revert bpo-39576: Clarify the word size for the 32-bit build. (GH-20744)

This reverts commit 24c570bbb82a7cb70576c253a73390accfa7ed78.

5 years agobpo-40861: Enable optimizations when building liblzma (GH-20724)
Miss Islington (bot) [Mon, 8 Jun 2020 17:06:31 +0000 (10:06 -0700)] 
bpo-40861: Enable optimizations when building liblzma (GH-20724)

(cherry picked from commit 3a3a30c5a4622e18be9f7e4a239dc9e0d7c8054c)

Co-authored-by: Steve Dower <steve.dower@python.org>
5 years agobpo-22021: Update root_dir and base_dir documentation in shutil (GH-10367)
Miss Islington (bot) [Mon, 8 Jun 2020 05:07:06 +0000 (22:07 -0700)] 
bpo-22021: Update root_dir and base_dir documentation in shutil (GH-10367)

Also added an example in shutil in order to make more clear how they are to be used.

Initially reported by Weinan Li on bpo.
(cherry picked from commit 7633371dace67aaa21eb4b86f889441571ec4167)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
5 years agobpo-40741: Update macOS installer to use SQLite 3.32.2. (GH-20705)
Miss Islington (bot) [Mon, 8 Jun 2020 02:42:16 +0000 (19:42 -0700)] 
bpo-40741: Update macOS installer to use SQLite 3.32.2. (GH-20705)

(cherry picked from commit 37eed5a9ee7c802e7151ee9939ed604032886639)

Co-authored-by: Ned Deily <nad@python.org>
5 years ago[3.8] bpo-40807: Backport test_codeop change [GH-19670]
Miss Islington (bot) [Fri, 5 Jun 2020 03:00:47 +0000 (20:00 -0700)] 
[3.8] bpo-40807: Backport test_codeop change [GH-19670]

A tiny sliver of a 3.9 PEG parser patch needed to backport the test added by GH-20486.
(cherry picked from commit a5d6aba318ead9cc756ba750a70da41f5def3f8f)

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
5 years agoFix spacing in docs for tarfile (GH-20629)
Miss Islington (bot) [Thu, 4 Jun 2020 20:19:51 +0000 (13:19 -0700)] 
Fix spacing in docs for tarfile (GH-20629)

Before
```
content.txt is 42 bytes in size and isa regular file.
folder is 420 bytes in size and isa directory.
magic is 4200 bytes in size and issomething else.
```

After:
```
content.txt is 42 bytes in size and is a regular file.
folder is 420 bytes in size and is a directory.
magic is 4200 bytes in size and is something else.
```

Automerge-Triggered-By: @orsenthil
(cherry picked from commit 7a280197f4162e5fcdde6f34701a9fa6e669190d)

Co-authored-by: Harsha Laxman <HarshaLaxman@users.noreply.github.com>
5 years agobpo-40767: Allow pure Wayland to get default XDG web browser (GH-20382)
Miss Islington (bot) [Wed, 3 Jun 2020 13:01:23 +0000 (06:01 -0700)] 
bpo-40767: Allow pure Wayland to get default XDG web browser (GH-20382)

Would be nice to backport to python 3.7+. I don't think it's worth the hassle to backport this all the way down to 3.10. But I'll let the maintainers decide.

This is hard to test because the test setup already includes this [environment variable](https://github.com/python/cpython/blob/master/Lib/test/pythoninfo.pyGH-L292)

Let me know if something doesn't match the PR guidelines. This is my first PR in the python source code.
(cherry picked from commit c822efeda9a0afe87cf3429724732fc8e19a01fb)

Co-authored-by: Jeremy Attali <jeremy.attali@gmail.com>
5 years agoEnsure correct version of Sphinx is used for Windows builds (GH-20582)
Miss Islington (bot) [Mon, 1 Jun 2020 21:23:18 +0000 (14:23 -0700)] 
Ensure correct version of Sphinx is used for Windows builds (GH-20582)

(cherry picked from commit fe5dd78182dbf4937bcc2b113ca7526bfad0192b)

Co-authored-by: Steve Dower <steve.dower@python.org>
5 years agobpo-40831: Remove an incorrect statement in the Windows docs (GH-20570)
Miss Islington (bot) [Mon, 1 Jun 2020 15:53:39 +0000 (08:53 -0700)] 
bpo-40831: Remove an incorrect statement in the Windows docs (GH-20570)

(cherry picked from commit c8966667bbdb284c3780ef6cec8a3870935a6bb7)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
5 years agobpo-30008: Fix OpenSSL no-deprecated compilation (GH-20397)
Miss Islington (bot) [Mon, 1 Jun 2020 07:11:51 +0000 (00:11 -0700)] 
bpo-30008: Fix OpenSSL no-deprecated compilation (GH-20397)

Fix :mod:`ssl`` code to be compatible with OpenSSL 1.1.x builds that use
``no-deprecated`` and ``--api=1.1.0``.

Note: Tests assume full OpenSSL API and fail with limited API.

Signed-off-by: Christian Heimes <christian@python.org>
Co-authored-by: Mark Wright <gienah@gentoo.org>
(cherry picked from commit a871f692b4a2e6c7d45579693e787edc0af1a02c)

Co-authored-by: Christian Heimes <christian@python.org>
5 years agobpo-40798: Generate a different message for already removed elements (GH-20483)
Miss Islington (bot) [Sat, 30 May 2020 07:52:27 +0000 (00:52 -0700)] 
bpo-40798: Generate a different message for already removed elements (GH-20483)

(cherry picked from commit 735d902b363b759df9ff00e58bbf4f7e2bde78cd)

Co-authored-by: Florian Dahlitz <f2dahlitz@freenet.de>
5 years agocloses bpo-29017: Update the bindings for Qt information with PySide2 (GH-20149)
Miss Islington (bot) [Sat, 30 May 2020 02:03:10 +0000 (19:03 -0700)] 
closes bpo-29017: Update the bindings for Qt information with PySide2 (GH-20149)

Reference to PySide has been removed has it is for Qt 4, which has reached end of life.
(cherry picked from commit 4649202ea75d48e1496e99911709824ca2d3170e)

Co-authored-by: Samuel Gaist <samuel.gaist@idiap.ch>
5 years agobpo-39885: Make IDLE context menu cut and copy work again (GH-18951)
Miss Islington (bot) [Fri, 29 May 2020 23:11:28 +0000 (16:11 -0700)] 
bpo-39885: Make IDLE context menu cut and copy work again (GH-18951)

Leave selection when right click within.  This exception to clearing selections when right-clicking was omitted from the previous commit, 4ca060d.  I did not realize that this completely disabled the context menu entries, and  I should have merged a minimal fix immediately.  An automated test should follow.
(cherry picked from commit 97e4e0f53d6690db6b942678489716a30925b8af)

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
5 years agobpo-24048: Save the live exception during import.c's remove_module() (GH-13005)
Miss Islington (bot) [Fri, 29 May 2020 19:35:21 +0000 (12:35 -0700)] 
bpo-24048: Save the live exception during import.c's remove_module() (GH-13005)

Save the live exception during the course of remove_module().
(cherry picked from commit 94a64e9cd411a87514b68082c1c437eb3b49dfb9)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
5 years ago[3.8] bpo-25872: Fix KeyError in linecache when multithreaded (GH-18007) (GH-20092)
Miss Islington (bot) [Fri, 29 May 2020 12:17:42 +0000 (05:17 -0700)] 
[3.8] bpo-25872: Fix KeyError in linecache when multithreaded (GH-18007) (GH-20092)

Backporting to 3.8 and adding a NEWS item (I should have added one to the master branch -- oh well).
(cherry picked from commit b86636bff4b29ce23c886df079715dd951f13a07)

Co-authored-by: Andrew Kuchling <amk@amk.ca>
5 years agobpo-39040: Fix parsing of email mime headers with whitespace between encoded-words...
Miss Islington (bot) [Fri, 29 May 2020 11:43:47 +0000 (04:43 -0700)] 
bpo-39040: Fix parsing of email mime headers with whitespace between encoded-words. (gh-17620)

* bpo-39040: Fix parsing of email headers with encoded-words inside a quoted string.

It is fairly common to find malformed mime headers (especially content-disposition
headers) where the parameter values, instead of being encoded to RFC
standards, are "encoded" by doing RFC 2047 "encoded word" encoding, and
then enclosing the whole thing in quotes.  The processing of these malformed
headers was incorrectly leaving the spaces between encoded words in the decoded
text (whitespace between adjacent encoded words is supposed to be stripped on
decoding).  This changeset fixes the encoded word processing inside quoted strings
(bare-quoted-string) to do correct RFC 2047 decoding by stripping that
whitespace.
(cherry picked from commit 21017ed904f734be9f195ae1274eb81426a9e776)

Co-authored-by: Abhilash Raj <maxking@users.noreply.github.com>
5 years agoImprove IO tutorial's "Old string formatting" section (GH-16251)
Miss Islington (bot) [Thu, 28 May 2020 01:39:19 +0000 (18:39 -0700)] 
Improve IO tutorial's "Old string formatting" section (GH-16251)

* Use a more universal explanation of string interpolation rather than specifically referencing sprintf(), which depends on the reader having a C background.

Co-authored-by: Kyle Stanley <aeros167@gmail.com>
(cherry picked from commit eaca2aa117d663acf8160a0b4543ee2c7006fcc7)

Co-authored-by: Adorilson Bezerra <adorilson@gmail.com>
5 years agobpo-13097: ctypes: limit callback to 1024 arguments (GH-19914)
Miss Islington (bot) [Wed, 27 May 2020 15:51:23 +0000 (08:51 -0700)] 
bpo-13097: ctypes: limit callback to 1024 arguments (GH-19914)

ctypes now raises an ArgumentError when a callback
is invoked with more than 1024 arguments.

The ctypes module allocates arguments on the stack in
ctypes_callproc() using alloca(), which is problematic
when large numbers of arguments are passed. Instead
of a stack overflow, this commit raises an ArgumentError
if more than 1024 parameters are passed.
(cherry picked from commit 29a1384c040d39659e7d01f1fd7b6eb71ef2634e)

Co-authored-by: Sean Gillespie <sean@swgillespie.me>
5 years agobpo-39073: validate Address parts to disallow CRLF (GH-19007)
Miss Islington (bot) [Wed, 27 May 2020 13:38:14 +0000 (06:38 -0700)] 
bpo-39073: validate Address parts to disallow CRLF (GH-19007)

 Disallow CR or LF in email.headerregistry.Address arguments to guard against header injection attacks.
(cherry picked from commit 614f17211c5fc0e5b828be1d3320661d1038fe8f)

Co-authored-by: Ashwin Ramaswami <aramaswamis@gmail.com>
5 years agoFix the link to ncurses patch download in macos installer build script (GH-20421)
Miss Islington (bot) [Wed, 27 May 2020 10:29:25 +0000 (03:29 -0700)] 
Fix the link to ncurses patch download in macos installer build script (GH-20421)

Reason: the link `ftp://invisible-island.net/ncurses//5.9/ncurses-5.9-20120616-patch.sh.bz2` is dead, which prevents `Mac/BuildScript/build-installer.py` from completing. Looks like the host of the FTP server was changed to `ftp.invisible-island.net`, thus this proposal.

Signed-off-by: oleg.hoefling <oleg.hoefling@gmail.com>
(cherry picked from commit 7da46b676aed7111de34b57c8b942a7f3bb80327)

Co-authored-by: Oleg Höfling <hoefling@users.noreply.github.com>
5 years ago[3.7] bpo-38580: Document that select() accepts iterables, not just sequences (GH...
Tal Einat [Tue, 26 May 2020 12:59:23 +0000 (15:59 +0300)] 
[3.7] bpo-38580: Document that select() accepts iterables, not just sequences (GH-16832)

(cherry picked from commit 372ee27d4958302dac7ad6a8711f6fd04771b2e6)

Co-authored-by: Jakub Stasiak <jakub@stasiak.at>
5 years ago[3.8] bpo-35714: Reject null characters in struct format strings (GH-16928) (GH-20419)
Miss Islington (bot) [Tue, 26 May 2020 09:16:36 +0000 (02:16 -0700)] 
[3.8] bpo-35714: Reject null characters in struct format strings (GH-16928) (GH-20419)

struct.error is now raised if there is a null character in a struct
format string.
(cherry picked from commit 3f59b55316f4c6ab451997902579aa69020b537c)
(cherry picked from commit 5ff5edfef63b3dbc1abb004b3fa4b3db87e79ff9)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
5 years agobpo-39301: State that floor division is used for right shift operations (GH-20347...
Miss Islington (bot) [Tue, 26 May 2020 08:34:04 +0000 (01:34 -0700)] 
bpo-39301: State that floor division is used for right shift operations (GH-20347) (GH-20416)

* bpo-39301: State that floor division is used for right shift operations

* Remove "without overflow check"
(cherry picked from commit af7553ac95a96713be847dd45bc5a8aeb0a75955)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
Co-authored-by: Zackery Spytz <zspytz@gmail.com>
5 years agobpo-37309: Update NEWS.txt for 3.7.8 (GH-20353)
Terry Jan Reedy [Sun, 24 May 2020 13:40:19 +0000 (09:40 -0400)] 
bpo-37309: Update NEWS.txt for 3.7.8 (GH-20353)

5 years agobpo-40723: Make IDLE autocomplete test run without __main__.__file__ (GH-20311)
Miss Islington (bot) [Sun, 24 May 2020 11:12:11 +0000 (04:12 -0700)] 
bpo-40723: Make IDLE autocomplete test run without __main__.__file__ (GH-20311)

This was the only failure running unittest.main(test.test_idle) after imports.
(cherry picked from commit 905b3cd05f8d2c29e1605d109900e3e9d07af4d3)

Co-authored-by: Florian Dahlitz <f2dahlitz@freenet.de>
5 years agobpo-40439: Update broken link in lexical analysis docs (GH-20184)
Miss Islington (bot) [Sat, 23 May 2020 01:17:45 +0000 (18:17 -0700)] 
bpo-40439: Update broken link in lexical analysis docs (GH-20184)

Automerge-Triggered-By: @csabella
(cherry picked from commit af23f0d3cf19343512e6ca1fe1d46a5dbe425719)

Co-authored-by: Matteo Bertucci <matteobertucci2004@gmail.com>
5 years ago[3.7] bpo-40663: Correctly handle annotations with subscripts in ast_unparse.c (GH...
Batuhan Taskaya [Fri, 22 May 2020 22:32:34 +0000 (01:32 +0300)] 
[3.7] bpo-40663: Correctly handle annotations with subscripts in ast_unparse.c (GH-20156). (GH-20192)

(cherry picked from commit 2135e10dc717c00d10d899d232bebfc59bb25032)

Co-authored-by: Batuhan Taskaya <batuhanosmantaskaya@gmail.com>
5 years ago[3.7] [doc] Remove references to obsolete BuildApplet on macOS (GH-20023) (GH-20306)
Miss Islington (bot) [Thu, 21 May 2020 23:35:04 +0000 (16:35 -0700)] 
[3.7] [doc] Remove references to obsolete BuildApplet on macOS (GH-20023) (GH-20306)

(cherry picked from commit 7864f11cdf12807555d62c7a132c191eb41ecc02)

Co-authored-by: Andre Delfino <adelfino@gmail.com>
Automerge-Triggered-By: @ned-deily
5 years agos/wakup/wakeup (GH-20250)
Miss Islington (bot) [Wed, 20 May 2020 17:59:00 +0000 (10:59 -0700)] 
s/wakup/wakeup (GH-20250)

(as title)

Automerge-Triggered-By: @Mariatta
(cherry picked from commit f2947e354c95d246b1836ac78d4c820c420e259b)

Co-authored-by: Kunal Bhalla <bhalla.kunal@gmail.com>
5 years agoUse v2 of GitHub Actions where available (GH-20232)
Miss Islington (bot) [Wed, 20 May 2020 17:02:07 +0000 (10:02 -0700)] 
Use v2 of GitHub Actions where available (GH-20232)

Automerge-Triggered-By: @Mariatta
(cherry picked from commit 7fbe65dbc42985d002d9538fe9a9887e6e6af66c)

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
5 years agobpo-39631: Adds NEWS entry (GH-20227)
Miss Islington (bot) [Tue, 19 May 2020 22:17:11 +0000 (15:17 -0700)] 
bpo-39631: Adds NEWS entry (GH-20227)

(cherry picked from commit 92327a9913150f5bb55b2727a2c5d50f9b7b6e55)

Co-authored-by: Steve Dower <steve.dower@python.org>
5 years agobpo-39631: Fix file association MIME type in the Windows installer (GH-20205)
Miss Islington (bot) [Tue, 19 May 2020 12:41:07 +0000 (05:41 -0700)] 
bpo-39631: Fix file association MIME type in the Windows installer (GH-20205)

Use text/x-python instead of text/plain to avoid issues with tools assuming that "ShellExecute(script)" is a non-executable operation.
(cherry picked from commit 8c862e51248c5ebfec787badec88eb58c9267e1e)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
5 years ago[3.7] Doc: Python 3.10 in sidebar and version switcher. (GH-20209) (GH-20223)
Miss Islington (bot) [Tue, 19 May 2020 12:32:30 +0000 (05:32 -0700)] 
[3.7] Doc: Python 3.10 in sidebar and version switcher. (GH-20209) (GH-20223)

(cherry picked from commit 19e3e0026417caa92ffe21a67157363b45da9aa2)

Co-authored-by: Julien Palard <julien@palard.fr>
Automerge-Triggered-By: @JulienPalard
5 years agobpo-39976: Add **other_popen_kwargs to subprocess docs (GH-20145)
Miss Islington (bot) [Tue, 19 May 2020 09:28:22 +0000 (02:28 -0700)] 
bpo-39976: Add **other_popen_kwargs to subprocess docs (GH-20145)

(cherry picked from commit 46545000c2a30b46aed717b546bc09e5bae7148f)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
5 years agobpo-35890: Use RegQueryInfoKeyW and CryptAcquireContextW explicitly (GH-19974)
Steve Dower [Mon, 18 May 2020 22:24:41 +0000 (23:24 +0100)] 
bpo-35890: Use RegQueryInfoKeyW and CryptAcquireContextW explicitly (GH-19974)

Co-authored-by: Minmin Gong <gongminmin@msn.com>
5 years agobpo-40650: Include winsock2.h in pytime.c, instead of a full windows.h (GH-20137)
Miss Islington (bot) [Mon, 18 May 2020 16:39:13 +0000 (09:39 -0700)] 
bpo-40650: Include winsock2.h in pytime.c, instead of a full windows.h (GH-20137)

(cherry picked from commit f660567937277cc3a2cd53af77bbb18e905427e8)

Co-authored-by: Minmin Gong <gongminmin@msn.com>
5 years agobpo-40653: Move _dirnameW out of GH-ifdef HAVE_SYMLINK/GH-endif (GH-20144)
Miss Islington (bot) [Mon, 18 May 2020 16:34:21 +0000 (09:34 -0700)] 
bpo-40653: Move _dirnameW out of GH-ifdef HAVE_SYMLINK/GH-endif (GH-20144)

(cherry picked from commit 7f21c9ac872acc2114aee3313d132b016550ff42)

Co-authored-by: Minmin Gong <gongminmin@msn.com>
5 years agobpo-40548: Github Actions: update actions/checkout to v2 (GH-20164)
Miss Islington (bot) [Mon, 18 May 2020 14:06:55 +0000 (07:06 -0700)] 
bpo-40548: Github Actions: update actions/checkout to v2 (GH-20164)

Signed-off-by: Filipe Laíns <lains@archlinux.org>
(cherry picked from commit c444108dd62672f2b41539bcc8f15da44501f405)

Co-authored-by: Filipe Laíns <lains@archlinux.org>
5 years agoDoc: change 'Posix' for 'POSIX' (GH-20001)
Miss Islington (bot) [Sun, 17 May 2020 21:35:22 +0000 (14:35 -0700)] 
Doc: change 'Posix' for 'POSIX' (GH-20001)

(cherry picked from commit 65460565df99fbda6a74b6bb4bf99affaaf8bd95)

Co-authored-by: Mathieu Dupuy <mathieu.dupuy@doctolib.com>
5 years ago[3.7] bpo-40457: Support OpenSSL without TLS 1.0/1.1 (GH-19862) (GH-20126)
Miss Islington (bot) [Sat, 16 May 2020 08:45:06 +0000 (01:45 -0700)] 
[3.7] bpo-40457: Support OpenSSL without TLS 1.0/1.1 (GH-19862) (GH-20126)

5 years agobpo-40163: Fix multissltest download of old OpenSSL (GH-19329)
Miss Islington (bot) [Fri, 15 May 2020 20:54:54 +0000 (13:54 -0700)] 
bpo-40163: Fix multissltest download of old OpenSSL (GH-19329)

(cherry picked from commit 938717fd04c53c717895a756d5910e8c8813706c)

Co-authored-by: Christian Heimes <christian@python.org>
5 years ago[3.7] bpo-40515: Require OPENSSL_THREADS (GH-19953) (GH-20120)
Christian Heimes [Fri, 15 May 2020 20:37:32 +0000 (22:37 +0200)] 
[3.7] bpo-40515: Require OPENSSL_THREADS (GH-19953) (GH-20120)

5 years agobpo-40479: Test with latest OpenSSL versions (GH-20108)
Miss Islington (bot) [Fri, 15 May 2020 17:05:57 +0000 (10:05 -0700)] 
bpo-40479: Test with latest OpenSSL versions (GH-20108)

* 1.0.2u (EOL)
* 1.1.0l (EOL)
* 1.1.1g
* 3.0.0-alpha2 (disabled for now)

Build the FIPS provider and create a FIPS configuration file for OpenSSL
3.0.0.

Signed-off-by: Christian Heimes <christian@python.org>
Automerge-Triggered-By: @tiran
(cherry picked from commit 62d618c06bd395308b7163dbcb26c7e6d0922033)

Co-authored-by: Christian Heimes <christian@python.org>
5 years agobpo-40055: test_distutils leaves warnings filters unchanged (GH-20095)
Miss Islington (bot) [Fri, 15 May 2020 16:22:54 +0000 (09:22 -0700)] 
bpo-40055: test_distutils leaves warnings filters unchanged (GH-20095)

distutils.tests now saves/restores warnings filters to leave them
unchanged. Importing tests imports docutils which imports
pkg_resources which adds a warnings filter.
(cherry picked from commit 6e57237faf0da8904e0130a11350cae3c5062b82)

Co-authored-by: Victor Stinner <vstinner@python.org>
5 years ago[3.8] bpo-40548: GitHub Action workflow: skip jobs on doc only PRs (GH-20100)
Miss Islington (bot) [Fri, 15 May 2020 03:46:25 +0000 (20:46 -0700)] 
[3.8] bpo-40548: GitHub Action workflow: skip jobs on doc only PRs (GH-20100)

* bpo-40548: Always run GitHub action, even on doc PRs (GH-19981)

Always run GitHub action jobs, even on documentation-only pull
requests. So it will be possible to make a GitHub action job, like
the Windows (64-bit) job, mandatory.

(cherry picked from commit 4e363761fc02a89d53aba4382dc451293bd6f0ba)

* bpo-40548: GitHub Action workflow: skip jobs on doc only PRs (GH-19983)

Signed-off-by: Filipe Laíns <lains@archlinux.org>
(cherry picked from commit 75d7257b201a56f950c20cd9f5753a83fff4742b)

* bpo-40548: github actions: pass the changes check on no source changes (GH-20097)

Signed-off-by: Filipe Laíns <lains@archlinux.org>
(cherry picked from commit 6a78589b6b22878491a4b042bb8b3161e1d120f6)

Co-authored-by: Filipe Laíns <filipe.lains@gmail.com>
Co-authored-by: Filipe Laíns <lains@archlinux.org>
(cherry picked from commit 07bd5cf3d9551ae84100e6400836163fcd507f07)

Co-authored-by: Victor Stinner <vstinner@python.org>
5 years agobpo-38872: Document exec symbol for codeop.compile_command (GH-20047) (#20099)
Miss Islington (bot) [Fri, 15 May 2020 01:19:38 +0000 (18:19 -0700)] 
bpo-38872: Document exec symbol for codeop.compile_command (GH-20047) (#20099)

* Document exec symbol for codeop.compile_command

* Remove extra statements

Co-authored-by: nanjekyejoannah <joannah.nanjekye@ibm.com>
(cherry picked from commit 7ba1f75f3f02b4b50ac6d7e17d15e467afa36aac)

Co-authored-by: Joannah Nanjekye <33177550+nanjekyejoannah@users.noreply.github.com>
Co-authored-by: Joannah Nanjekye <33177550+nanjekyejoannah@users.noreply.github.com>
5 years agobpo-40561: Add docstrings for webbrowser open functions (GH-19999)
Miss Islington (bot) [Mon, 11 May 2020 19:06:32 +0000 (12:06 -0700)] 
bpo-40561: Add docstrings for webbrowser open functions (GH-19999)

Co-authored-by: Brad Solomon <brsolomon@deloitte.com>
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
(cherry picked from commit ef7973a981ff8f4687ef3fdb85a69fa15aa11fe5)

Co-authored-by: Brad Solomon <brad.solomon.1124@gmail.com>
5 years agoMake the first dataclass example more useful (GH-19994) (GH-19998)
Miss Islington (bot) [Fri, 8 May 2020 11:52:48 +0000 (04:52 -0700)] 
Make the first dataclass example more useful (GH-19994) (GH-19998)

(cherry picked from commit 2effef7453986bf43a6d921cd471a8bc0722c36a)

Co-authored-by: Ned Batchelder <ned@nedbatchelder.com>
Co-authored-by: Ned Batchelder <ned@nedbatchelder.com>
5 years ago[3.7] bpo-40559: Add Py_DECREF to _asynciomodule.c:task_step_impl() (GH-19990)
Miss Islington (bot) [Fri, 8 May 2020 11:30:30 +0000 (04:30 -0700)] 
[3.7] bpo-40559: Add Py_DECREF to _asynciomodule.c:task_step_impl() (GH-19990)

This fixes a possible memory leak in the C implementation of
asyncio.Task.
(cherry picked from commit d2c349b190bcba21a4a38e6520a48ad97a9f1529)

Co-authored-by: Chris Jerdonek <chris.jerdonek@gmail.com>
5 years ago[3.7] bpo-40417: Fix deprecation warning in PyImport_ReloadModule (GH-19750) (GH...
Robert Rouhani [Wed, 6 May 2020 00:49:29 +0000 (17:49 -0700)] 
[3.7] bpo-40417: Fix deprecation warning in PyImport_ReloadModule (GH-19750) (GH-19935)

Use importlib instead of imp.

Automerge-Triggered-By: @brettcannon.
(cherry picked from commit f40bd46)

Co-authored-by: Robert Rouhani robert.rouhani@gmail.com
5 years agobpo-40459: Fix NameError in platform.py (GH-19855)
Miss Islington (bot) [Tue, 5 May 2020 02:51:33 +0000 (19:51 -0700)] 
bpo-40459: Fix NameError in platform.py (GH-19855)

(cherry picked from commit 1e7e4519a8ddc2239101a0146d788c9161143a77)

Co-authored-by: Dennis Sweeney <36520290+sweeneyde@users.noreply.github.com>
5 years agobpo-40419: timeit CLI docs now mention 1,2,5,10,... trials instead of powers of 10...
Miss Islington (bot) [Sat, 2 May 2020 16:29:49 +0000 (09:29 -0700)] 
bpo-40419: timeit CLI docs now mention 1,2,5,10,... trials instead of powers of 10 (GH-19752)

(cherry picked from commit 766352320fd736e2c8ed545b4cc57563f61a0b9d)

Co-authored-by: Sander <svr003@gmail.com>
5 years ago[3.7] bpo-39435: Fix docs for pickle.loads (GH-18160). (GH-19844)
Antoine Pitrou [Fri, 1 May 2020 19:53:35 +0000 (21:53 +0200)] 
[3.7] bpo-39435: Fix docs for pickle.loads (GH-18160). (GH-19844)

(cherry picked from commit 289842ae820f99908d3a345f1f3b6d4e5b4b97fc)

Co-authored-by: Shantanu <hauntsaninja@users.noreply.github.com>
Automerge-Triggered-By: @pitrou