Merge back from r23b1-branch

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index d43b33e8a9f34590adaa3266cdb8ac9c0d12bf3d..93fb4a2706d7fbc0f29a8513289b877c96e9e34d 100644 (file)
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -470,6 +470,8 @@ def test_main():
         socketDataProcessed.acquire()
         socketDataProcessed.wait()
         socketDataProcessed.release()
+        for thread in threads:
+            thread.join()
         banner("logrecv output", "begin")
         sys.stdout.write(sockOut.getvalue())
         sockOut.close()

diff --git a/Misc/NEWS b/Misc/NEWS
index 843c84645889025d1184dde3acead39a933d313b..72513863ba9758d7ab4533ebfd9301369b7ff88f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -210,8 +210,6 @@ Tools/Demos
 - New script combinerefs.py helps analyze new PYTHONDUMPREFS output.
   See the module docstring for details.
 
-TBD
-
 Build
 -----
 
@@ -229,6 +227,7 @@ C API
 
 - LONG_LONG was renamed to PY_LONG_LONG.  Extensions that use this and
   need compatibility with previous versions can use this:
+
     #ifndef  PY_LONG_LONG
     #define  PY_LONG_LONG  LONG_LONG
     #endif
@@ -243,7 +242,7 @@ C API
 New platforms
 -------------
 
-TBD
+None this time.
 
 Tests
 -----