From ecf0f025180fc0a2df6eb638f4efeab7fb756ac9 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Sat, 26 Apr 2003 00:21:31 +0000
Subject: Merge back from r23b1-branch
---
Lib/test/test_logging.py | 2 ++
Misc/NEWS | 5 ++---
2 files changed, 4 insertions(+), 3 deletions(-)
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 @@ 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 843c846..7251386 100644
--- 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
-----
--
cgit v0.12