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

Fixes assertion failures in _datetimemodule.c
introduced in the previous fix (see bpo-31752).

Rather of trying to handle an int subclass as exact int,
let it to use overridden special methods, but check the
result of divmod().
(cherry picked from commit 3ec0f495)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

(cherry picked from commit 8b9c33ea)
Co-authored-by: Donald Stufft <donald@stufft.io>

This missed PyErr_NoMemory() could cause a SystemError when calling
_symtable.symtable().
(cherry picked from commit ad65f155)
Co-authored-by: Zackery Spytz <zspytz@gmail.com>

"single" needs to be decrefed if PyList_Append() fails.
(cherry picked from commit 4c596d54)
Co-authored-by: Zackery Spytz <zspytz@gmail.com>

Discovered using clang's MemorySanitizer.

A msan build will fail by simply executing: ./python -c 'u"\N"'
(cherry picked from commit 746b2d35)

Co-authored-by: Gregory P. Smith <greg@krypto.org> [Google LLC]

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

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

https://bugs.python.org/issue33699
(cherry picked from commit b086c8af)



https://bugs.python.org/issue33699

This typo doesn't affect the result because wrong bits are discarded
on implicit conversion to unsigned char, but it trips UBSan
with -fsanitize=implicit-integer-truncation.
(cherry picked from commit 7a69cf47)
Co-authored-by: Alexey Izbyshev <izbyshev@ispras.ru>

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

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

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

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

The test depended on '/usr/share/zoneinfo/posixrules' or equivalent
because it set TZ without explicit DST transition rules. At least
on OpenSUSE Tumbleweed that file is linked to '/etc/localtime',
making the test fail with certain local timezones,
such as 'Europe/Moscow' which doesn't have DST transitions since 2011.
(cherry picked from commit f1b9ad3d)
Co-authored-by: Alexey Izbyshev <izbyshev@ispras.ru>

[2.7] bpo-35133: Fix mistakes when concatenate string literals on different lines. (GH-10284) (GH-10335) (GH-10336)

Two kind of mistakes:

1. Missed space. After concatenating there is no space between words.

2. Missed comma. Causes unintentional concatenating in a list of strings.
(cherry picked from commit 34fd4c20)
(cherry picked from commit 7054e5c80b6e98cd44e22d1bc2d7f0a94343089d)

(cherry picked from commit fe62d877)
Co-authored-by: İsmail Arılık <arilik.ismail@gmail.com>

[2.7] closes bpo-35139: The `pyexpat` module's macros in `Modules/Setup` now match `setup.py` (GH-10293)

This could cause compile errors on macOS or other platforms..
(cherry picked from commit 318ab63c)
Co-authored-by: Max Bélanger <aeromax@gmail.com>

_io.IncrementalNewlineDecoder's initializer possibly assigns out-of-range
value to the bitwise struct field.
(cherry picked from commit b08746bf)
Co-authored-by: Xiang Zhang <angwerzx@126.com>

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)

(cherry picked from commit 53835e92)

(cherry picked from commit c0799ec9)
Co-authored-by: Gus Goulart <augusto@goulart.me>

(cherry picked from commit 18d57b4d)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

Based on the investigation by Xiang Zhang.
(cherry picked from commit df13df41)

Referring to ``pytest`` as ``py.test`` is deprecated..
(cherry picked from commit d855f2fd)
Co-authored-by: Andreas Pelme <andreas@pelme.se>

Specify that blocks are non-overlapping. Change '!=' to '<'.
(cherry picked from commit d9bff4e8)
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>

Prior to this revision, after the shutdown of a `BaseServer`,
the server accepted a last single request
if it was sent between the server socket polling
and the polling timeout.

This can be problematic for instance for a server restart
for which you do not want to interrupt the service,
by not closing the listening socket during the restart.
One request failed because of this behavior.

Note that only one request failed,
following requests were not accepted, as expected.

(cherry picked from commit 10cb3760)

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

* bpo-34576 - Fix the formatting for security considerations in http.server.rst (#10005)

* Address review comment..
(cherry picked from commit eeab510b)
Co-authored-by: Senthil Kumaran <skumaran@gatech.edu>

Don't leak a reference if PyDict_Update() fails, check the
PyList_New() call in treebuilder_new(), and properly handle failures
in xmlparser().

(cherry picked from commit 9f3ed3e2)

Fix the documentation of copy2, as it does not copy file ownership (user and
group), only mode, mtime, atime and flags.

The original text was confusing to developers as it suggested that this
command is the same as 'cp -p', but according to cp(1), '-p' copies file
ownership as well.

Clarify which metadata is copied by shutil.copystat in its docstring.

(cherry picked from commit 4f399be0)

This reverts commit 7829bba4.

(cherry picked from commit 83a07652)

Co-authored-by: Andrei Petre p31andrei@gmail.com

(cherry picked from commit 1deea5e5).
(cherry picked from commit bd9c2ce7acaef45f23c2659b854fc9925096d040)
Co-authored-by: Juliette Monsel <j4321@users.noreply.github.com>

[2.7] bpo-31500: Add idlelib news items about HiDPI scaling

(cherry picked from commit a96c96f5)