[Python-checkins] gh-96125: Fix sys.thread_info.name on pthread platforms (GH-96126)

[miss-islington]

https://github.com/python/cpython/commit/822955c16654c22c10a993f5a94bbb68b857a150
commit: 822955c16654c22c10a993f5a94bbb68b857a150
branch: main
author: Christian Heimes <christian at python.org>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-08-19T12:41:25-07:00
summary:

gh-96125: Fix sys.thread_info.name on pthread platforms (GH-96126)



Automerge-Triggered-By: GH:tiran

files:
A Misc/NEWS.d/next/Library/2022-08-19-18-21-01.gh-issue-96125.ODcF1Y.rst
M Lib/test/test_sys.py
M Python/thread.c

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 78da09d6abc..202fb30a8a7 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -628,6 +628,14 @@ def test_thread_info(self):
         self.assertEqual(len(info), 3)
         self.assertIn(info.name, ('nt', 'pthread', 'pthread-stubs', 'solaris', None))
         self.assertIn(info.lock, ('semaphore', 'mutex+cond', None))
+        if sys.platform.startswith(("linux", "freebsd")):
+            self.assertEqual(info.name, "pthread")
+        elif sys.platform == "win32":
+            self.assertEqual(info.name, "nt")
+        elif sys.platform == "emscripten":
+            self.assertIn(info.name, {"pthread", "pthread-stubs"})
+        elif sys.platform == "wasi":
+            self.assertEqual(info.name, "pthread-stubs")
 
     @unittest.skipUnless(support.is_emscripten, "only available on Emscripten")
     def test_emscripten_info(self):
diff --git a/Misc/NEWS.d/next/Library/2022-08-19-18-21-01.gh-issue-96125.ODcF1Y.rst b/Misc/NEWS.d/next/Library/2022-08-19-18-21-01.gh-issue-96125.ODcF1Y.rst
new file mode 100644
index 00000000000..ba7d26a9658
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-08-19-18-21-01.gh-issue-96125.ODcF1Y.rst
@@ -0,0 +1,2 @@
+Fix incorrect condition that causes ``sys.thread_info.name`` to be wrong on
+pthread platforms.
diff --git a/Python/thread.c b/Python/thread.c
index e206a69c050..8c8a4e81895 100644
--- a/Python/thread.c
+++ b/Python/thread.c
@@ -59,7 +59,7 @@ PyThread_init_thread(void)
 #   define PYTHREAD_NAME "pthread-stubs"
 #   include "thread_pthread_stubs.h"
 #elif defined(_POSIX_THREADS)
-#   if defined(__EMSCRIPTEN__) || !defined(__EMSCRIPTEN_PTHREADS__)
+#   if defined(__EMSCRIPTEN__) && !defined(__EMSCRIPTEN_PTHREADS__)
 #     define PYTHREAD_NAME "pthread-stubs"
 #   else
 #     define PYTHREAD_NAME "pthread"