merge

diff --cc Lib/test/datetimetester.py
Simple merge

diff --cc Misc/NEWS
index 945527c96cb77914be69f7df505dfb7a8a1cbc86,1127e373032bed0412350ac81bf03b8c56fbf9c7..ca36123ee59d3423a5feaeda35d29f658b052ce4
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -232,27 -93,12 +232,29 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #21925: :func:`warnings.formatwarning` now catches exceptions on
 -  ``linecache.getline(...)`` to be able to log :exc:`ResourceWarning` emitted
 -  late during the Python shutdown process.
+ - Issue #26616: Fixed a bug in datetime.astimezone() method.
+ 
 +- Issue #26637: The :mod:`importlib` module now emits an :exc:`ImportError`
 +  rather than a :exc:`TypeError` if :func:`__import__` is tried during the
 +  Python shutdown process but :data:`sys.path` is already cleared (set to
 +  ``None``).
 +
 +- Issue #21925: :func:`warnings.formatwarning` now catches exceptions when
 +  calling :func:`linecache.getline` and
 +  :func:`tracemalloc.get_object_traceback` to be able to log
 +  :exc:`ResourceWarning` emitted late during the Python shutdown process.
 +
 +- Issue #23848: On Windows, faulthandler.enable() now also installs an
 +  exception handler to dump the traceback of all Python threads on any Windows
 +  exception, not only on UNIX signals (SIGSEGV, SIGFPE, SIGABRT).
 +
 +- Issue #26530: Add C functions :c:func:`_PyTraceMalloc_Track` and
 +  :c:func:`_PyTraceMalloc_Untrack` to track memory blocks using the
 +  :mod:`tracemalloc` module. Add :c:func:`_PyTraceMalloc_GetTraceback` to get
 +  the traceback of an object.
 +
 +- Issue #26588: The _tracemalloc now supports tracing memory allocations of
 +  multiple address spaces (domains).
  
  - Issue #24266: Ctrl+C during Readline history search now cancels the search
    mode when compiled with Readline 7.

diff --cc Modules/_datetimemodule.c
Simple merge