Issue #11852: Merge fix from 3.2.

diff --cc Lib/logging/handlers.py
Simple merge

diff --cc Lib/test/test_logging.py
index 88f0ebc42eee970c4fa23f52a59d540f40211771,6623a0f532257626f91c538a2280689e6e5f99cf..b2e3327fd56bdea0faeb67d48b9ad1b112231020
--- 1/Lib/test/test_logging.py
--- 2/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@@ -40,7 -40,8 +40,8 @@@ from socketserver import ThreadingTCPSe
  import struct
  import sys
  import tempfile
 -from test.support import captured_stdout, run_with_locale, run_unittest
 +from test.support import captured_stdout, run_with_locale, run_unittest, patch
+ from test.support import TestHandler, Matcher
  import textwrap
  import unittest
  import warnings

diff --cc Misc/NEWS
Simple merge