(cherry picked from commit 3b0047d8)
Co-authored-by: Alexey Izbyshev <izbyshev@ispras.ru>

(cherry picked from commit 83a07652)
Co-authored-by: Andrei Petre <p31andrei@gmail.com>

* Use _PyUnicode_Copy in sanitize_isoformat_str

* Use repr in fromisoformat error message

This reverses commit 67b74a98b2 per Serhiy Storchaka's suggestion:

     I suggested to use %R in the error message because including the raw
     string can be confusing in the case of empty string, or string
     containing trailing whitespaces, invisible or unprintable characters.

We agree that it is better to change both the C and pure Python versions
to use repr.

* Retain non-sanitized dtstr for error printing

This does not create an extra string, it just holds on to a reference to
the original input string for purposes of creating the error message.

* PEP 7 fixes to from_isoformat

* Separate handling of Unicode and other errors

In the initial implementation, errors other than encoding errors would
both raise an error indicating an invalid format, which would not be
true for errors like MemoryError.

* Drop needs_decref from _sanitize_isoformat_str

Instead _sanitize_isoformat_str returns a new reference, even to the
original string.
(cherry picked from commit 3df85404)
Co-authored-by: Paul Ganssle <pganssle@users.noreply.github.com>

Constructing bytes from mutating list could cause a crash.
(cherry picked from commit 914f9a07)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

Guard the `CLOCK_GETTIME` et al macros in `timemodule` based on the availability of the parent functions
(cherry picked from commit 94451182)
Co-authored-by: Max Bélanger <aeromax@gmail.com>

https://bugs.python.org/issue35032
(cherry picked from commit d262250d)
Co-authored-by: Stéphane Wirtel <stephane@wirtel.be>

(cherry picked from commit 6f17e513)

(cherry picked from commit a5259fb0)
Co-authored-by: Sergey Fedoseev <fedoseev.sergey@gmail.com>

This reverts commit 57038bcb.

* Add News entry for the change in multiprocessing.reduction.recvfds
made in GH-9613.
(cherry picked from commit bd036d3d)
Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>

https://bugs.python.org/issue34970
(cherry picked from commit 97cf0828)
Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com>

Set SRCDIR as the current directory for git.
(cherry picked from commit aa95bfb5)
Co-authored-by: Alexey Izbyshev <izbyshev@ispras.ru>

Add restriction on the offset parameter for mmap.flush.

Explain that ALLOCATIONGRANULARITY is the same as PAGESIZE in Unix.
(cherry picked from commit 027664a3)
Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>

path_error() uses GetLastError() on Windows, but some os functions
are implemented via CRT APIs which report errors via errno.
This may result in raising OSError with invalid error code (such
as zero).

Introduce posix_path_error() function and use it where appropriate.
(cherry picked from commit 83460311)
Co-authored-by: Alexey Izbyshev <izbyshev@ispras.ru>

Initial patch by Chandan Kumar.
(cherry picked from commit 13ae4d44)
Co-authored-by: Berker Peksag <berker.peksag@gmail.com>

(cherry picked from commit ded87d80)
Co-authored-by: Matthias Bussonnier <bussonniermatthias@gmail.com>

* raise exception if _missing_ returns None or invalid type

(cherry picked from commit 0f14fc1a)
Co-authored-by: Andrés Delfino <adelfino@gmail.com>

(cherry picked from commit f192aeb9)
Co-authored-by: Srinivas  Thatiparthy (శ్రీనివాస్  తాటిపర్తి) <srinivasreddy@users.noreply.github.com>

On failure, _PyBytes_Resize() will deallocate the bytes object and set
"result" to NULL.

https://bugs.python.org/issue34824
(cherry picked from commit 365ad2ea)
Co-authored-by: Zackery Spytz <zspytz@gmail.com>

The xml.sax and xml.dom.domreg modules now obey
sys.flags.ignore_environment.
Signed-off-by: Christian Heimes <christian@python.org>

(cherry picked from commit 223e501f)
Co-authored-by: Christian Heimes <christian@python.org>

(cherry picked from commit d6a61f23)
Co-authored-by: Chris Barker <Chris.Barker@noaa.gov>

Address a C undefined behavior signed integer overflow issue in set object table resizing.  Our -fwrapv compiler flag and practical reasons why sets are unlikely to get this large should mean this was never an issue but it was incorrect code that generates code analysis warnings.
Co-authored-by: Sergey Fedoseev <fedoseev.sergey@gmail.com>

(cherry picked from commit acef6906)
Co-authored-by: Julien Palard <julien@palard.fr>

The docs in `library/unittest.mock` have been updated to remove
confusing terms about submock and be explicit about the behavior
expected.
(cherry picked from commit 96200eb2)
Co-authored-by: Mario Corchero <mariocj89@gmail.com>

The reprlib code was copied here instead of importing reprlib. I'm not sure if we really need to avoid the import, but since I expect dataclasses to be more common that reprlib, it seems wise. Plus, the code is small.
(cherry picked from commit dd13c88b)
Co-authored-by: Srinivas  Thatiparthy (శ్రీనివాస్  తాటిపర్తి) <srinivasreddy@users.noreply.github.com>

(cherry picked from commit 1deea5e5)

Adding `max_num_fields` to `cgi.FieldStorage` to make DOS attacks harder by
limiting the number of `MiniFieldStorage` objects created by `FieldStorage`.
(cherry picked from commit 20914483)
Co-authored-by: matthewbelisle-wf <matthew.belisle@workiva.com>

(cherry picked from commit 68def052)
Co-authored-by: Zackery Spytz <zspytz@gmail.com>

(cherry picked from commit c984d20e)
Co-authored-by: Cheryl Sabella <cheryl.sabella@gmail.com>

According to the versionchanged note, the `strict` argument was removed in 3.3 and `policy` was added, but the name of the argument in the paragraph wasn't updated.
(cherry picked from commit a5ca9853)
Co-authored-by: Cheryl Sabella <cheryl.sabella@gmail.com>

(cherry picked from commit bbd90e4f)
Co-authored-by: Vinay Sajip <vinay_sajip@yahoo.co.uk>

C implementation of xml.etree.ElementTree.Element.__setstate__()
leaked references to children when called for already initialized
element.
(cherry picked from commit 6f906b3d)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

 On macOS, fix reading from and writing into a file with a size larger than 2 GiB.
(cherry picked from commit 74a8b6ea)
Co-authored-by: Stéphane Wirtel <stephane@wirtel.be>

Restores the use of pyexpatns.h to isolate our embedded copy of the expat C
library so that its symbols do not conflict at link or dynamic loading time
with an embedding application or other extension modules with their own
version of libexpat.

https://github.com/python/cpython/commit/5dc3f23b5fb0b510926012cb3732dae63cddea60GH-diff-3afaf7274c90ce1b7405f75ad825f545 inadvertently removed it when upgrading expat.
(cherry picked from commit 9d4712bc)
Co-authored-by: Gregory P. Smith <greg@krypto.org>


https://bugs.python.org/issue35011