Issue #10941: Fix imaplib.Internaldate2tuple to produce correct result near

the DST transition.  Patch by Joe Peterson.

diff --cc Lib/imaplib.py
Simple merge

diff --cc Lib/test/support.py
index a1ab09c2bed45b7d52f1ffca97f3a0855a24eaef,0526b14fdbdf77f54cb7f8eba6866e2d0448c4c9..a7d0833a60213ee9df2f5c9262035d055f8c609d
--- 1/Lib/test/support.py
--- 2/Lib/test/support.py
+++ b/Lib/test/support.py
@@@ -44,20 -39,21 +44,20 @@@ __all__ = 
      "Error", "TestFailed", "ResourceDenied", "import_module",
      "verbose", "use_resources", "max_memuse", "record_original_stdout",
      "get_original_stdout", "unload", "unlink", "rmtree", "forget",
 -    "is_resource_enabled", "requires", "requires_mac_ver",
 -    "find_unused_port", "bind_port",
 -    "fcmp", "is_jython", "TESTFN", "HOST", "FUZZ", "SAVEDCWD", "temp_cwd",
 -    "findfile", "sortdict", "check_syntax_error", "open_urlresource",
 -    "check_warnings", "CleanImport", "EnvironmentVarGuard",
 -    "TransientResource", "captured_output", "captured_stdout",
 -    "captured_stdin", "captured_stderr",
 -    "time_out", "socket_peer_reset", "ioerror_peer_reset",
 -    "run_with_locale", 'temp_umask', "transient_internet",
 -    "set_memlimit", "bigmemtest", "bigaddrspacetest", "BasicTestRunner",
 -    "run_unittest", "run_doctest", "threading_setup", "threading_cleanup",
 -    "reap_children", "cpython_only", "check_impl_detail", "get_attribute",
 -    "swap_item", "swap_attr", "requires_IEEE_754",
 +    "is_resource_enabled", "requires", "requires_freebsd_version",
 +    "requires_linux_version", "requires_mac_ver", "find_unused_port", "bind_port",
 +    "IPV6_ENABLED", "is_jython", "TESTFN", "HOST", "SAVEDCWD", "temp_cwd",
 +    "findfile", "create_empty_file", "sortdict", "check_syntax_error", "open_urlresource",
 +    "check_warnings", "CleanImport", "EnvironmentVarGuard", "TransientResource",
 +    "captured_stdout", "captured_stdin", "captured_stderr", "time_out",
 +    "socket_peer_reset", "ioerror_peer_reset", "run_with_locale", 'temp_umask',
 +    "transient_internet", "set_memlimit", "bigmemtest", "bigaddrspacetest",
 +    "BasicTestRunner", "run_unittest", "run_doctest", "threading_setup",
 +    "threading_cleanup", "reap_children", "cpython_only", "check_impl_detail",
 +    "get_attribute", "swap_item", "swap_attr", "requires_IEEE_754",
      "TestHandler", "Matcher", "can_symlink", "skip_unless_symlink",
 -    "import_fresh_module", "failfast", "run_with_tz"
 +    "import_fresh_module", "requires_zlib", "PIPE_MAX_SIZE", "failfast",
-     "anticipate_failure"
++    "anticipate_failure", "run_with_tz"
      ]
  
  class Error(Exception):

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

diff --cc Misc/ACKS
index b2e709aef534c4e4f15600dc8668d413cb487085,7373bc91a51d2405ff986b308be8617fdbc2fe07..3509126fbf00899968dc417c9d10fdd9be3181db
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -769,7 -702,7 +769,8 @@@ Peter Parent
  Alexandre Parenteau
  Dan Parisien
  Harri Pasanen
 +Gaël Pasgrimaud
+ Joe Peterson
  Randy Pausch
  Samuele Pedroni
  Marcel van der Peijl

diff --cc Misc/NEWS
index b907f8c490229e2cd2b61ba8ba595d80ce8aba81,412735bb07dccfbdc3d57694c9b4abb5c45631f9..33c640a2da2850812bb39d4571bb8cdd389a9b55
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -84,21 -36,31 +84,24 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #10941: Fix imaplib.Internaldate2tuple to produce correct result near
+   the DST transition.  Patch by Joe Peterson.
+ 
  - Issue #9154: Fix parser module to understand function annotations.
  
 +- Issue #6085: In http.server.py SimpleHTTPServer.address_string returns the
 +  client ip address instead client hostname. Patch by Charles-François Natali.
 +
 +- Issue #14309: Deprecate time.clock(), use time.perf_counter() or
 +  time.process_time() instead.
 +
 +- Issue #14428: Implement the PEP 418. Add time.get_clock_info(),
 +  time.perf_counter() and time.process_time() functions, and rename
 +  time.steady() to time.monotonic().
 +
 +- Issue #14646: importlib.util.module_for_loader() now sets __loader__ and
 +  __package__ (when possible).
 +
  - Issue #14664: It is now possible to use @unittest.skip{If,Unless} on a
    test class that doesn't inherit from TestCase (i.e. a mixin).