(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)

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

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>

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

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

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

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

Verify the value for the parameter '-s' of the cProfile CLI. Patch by Robert
Kuska.
Co-authored-by: Robert Kuska <rkuska@gmail.com>
(cherry picked from commit fcd5e84a)





https://bugs.python.org/issue23420

(cherry picked from commit e385d066)
Co-authored-by: Stéphane Wirtel <stephane@wirtel.be>

(cherry picked from commit d4d60134)

python-gdb.py now handles errors on computing the line number
of a Python frame.

Changes:

* PyFrameObjectPtr.current_line_num() now catchs any Exception on
  calling addr2line(), instead of failing with a surprising "<class
  'TypeError'> 'FakeRepr' object is not subscriptable" error.
* All callers of current_line_num() now handle current_line_num()
  returning None.
* PyFrameObjectPtr.current_line() now also catchs IndexError on
  getting a line from the Python source file.

(cherry picked from commit 2e438cc2)

The bytearray constructor converted unexpected exceptions
(e.g. MemoryError and KeyboardInterrupt) to TypeError.
(cherry picked from commit e890421e)

Covered all special cases: bytes, tuple, list, differend
kinds of iterables and iterators.
(cherry picked from commit 1a997eb2)

Frame's field f_tstate is NULL when the generator is exhausted.

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

When Python is built with the intel control-flow protection flags,
-mcet -fcf-protection, gdb is not able to read the stack without
actually jumping inside the function. This means an extra
'next' command is required to make the $pc (program counter)
enter the function and make the stack of the function exposed to gdb.

test_gdb: get_gdb_repr() now uses the "backtrace 1" command after
breakpoint, as in the master branch.
Co-Authored-By: Marcel Plch <gmarcel.plch@gmail.com>

(cherry picked from commit 9b7c74ca)
(cherry picked from commit 79d21331)