Issue #26583: merge from 3.5

diff --cc Misc/NEWS
index af4f6c9de675408e0d2e899cf12169b8bb305d66,78980fe9663e500e7fefd098fa3d74f3fce8cc46..7d3f422c54956b47c38136be1daabf9171d38463
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -829,23 -319,9 +829,26 @@@ Test
  - Issue #25616: Tests for OrderedDict are extracted from test_collections
    into separate file test_ordered_dict.
  
 +- Issue #25449: Added tests for OrderedDict subclasses.
 +
 +- Issue #25188: Add -P/--pgo to test.regrtest to suppress error output when
 +  running the test suite for the purposes of a PGO build. Initial patch by
 +  Alecsandru Patrascu.
 +
 +- Issue #22806: Add ``python -m test --list-tests`` command to list tests.
 +
 +- Issue #18174: ``python -m test --huntrleaks ...`` now also checks for leak of
 +  file descriptors. Patch written by Richard Oudkerk.
 +
 +- Issue #25260: Fix ``python -m test --coverage`` on Windows. Remove the
 +  list of ignored directories.
 +
 +- ``PCbuild\rt.bat`` now accepts an unlimited number of arguments to pass along
 +  to regrtest.py.  Previously there was a limit of 9.
 +
+ - Issue #26583: Skip test_timestamp_overflow in test_import if bytecode
+   files cannot be written.
+ 
  Build
  -----