traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge back from r23b1-branch

This commit is contained in:
Guido van Rossum 2003-04-26 00:21:31 +00:00
parent fa1eddfb21
commit ecf0f02518
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_logging.py
View File

@ -470,6 +470,8 @@ def test_main():
socketDataProcessed.acquire() socketDataProcessed.acquire()
socketDataProcessed.wait() socketDataProcessed.wait()
socketDataProcessed.release() socketDataProcessed.release()
for thread in threads:
thread.join()
banner("logrecv output", "begin") banner("logrecv output", "begin")
sys.stdout.write(sockOut.getvalue()) sys.stdout.write(sockOut.getvalue())
sockOut.close() sockOut.close()

5
Misc/NEWS
View File

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