Merge back from r23b1-branch
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index d43b33e..93fb4a2 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -470,6 +470,8 @@
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 843c846..7251386 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -210,8 +210,6 @@
- New script combinerefs.py helps analyze new PYTHONDUMPREFS output.
See the module docstring for details.
-TBD
-
Build
-----
@@ -229,6 +227,7 @@
- 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 @@
New platforms
-------------
-TBD
+None this time.
Tests
-----