Skip to content

C
cpython
Kaydet (Commit) ecf0f025 authored tarafından Guido van Rossum's avatar Guido van Rossum
Dosyalara gözat
Seçenekler

Merge back from r23b1-branch

üst fa1eddfb
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
Lib/test/test_logging.py
Dosyayı görüntüle @ ecf0f025
...@@ -470,6 +470,8 @@ def test_main(): ...@@ -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()
......
Misc/NEWS
Dosyayı görüntüle @ ecf0f025
...@@ -210,8 +210,6 @@ Tools/Demos ...@@ -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 ...@@ -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 ...@@ -243,7 +242,7 @@ C API
New platforms New platforms
------------- -------------
TBD None this time.
Tests Tests
----- -----
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment