gh-59705: Add _thread.set_name() function

Lib/test/test_threading.py

@@ -2103,55 +2103,50 @@ def test__all__(self):
         support.check__all__(self, threading, ('threading', '_thread'),
                              extra=extra, not_exported=not_exported)
 
+    @unittest.skipUnless(hasattr(_thread, 'set_name'), "missing _thread.set_name")
+    @unittest.skipUnless(hasattr(_thread, '_get_name'), "missing _thread._get_name")
     def test_set_name(self):
-        try:
-            get_name = _thread._get_name
-            _thread.set_name
-        except AttributeError:
-            self.skipTest("need thread._get_name() and thread.set_name()")
-
-        def work():
-            nonlocal work_name
-            work_name = get_name()
-
         # set_name() limit in bytes
         truncate = getattr(_thread, "_NAME_MAXLEN", None)
         limit = truncate or 100
 
-        def create_test(name):
-            if sys.platform.startswith("solaris"):
-                encoding = "utf-8"
-            else:
-                encoding = sys.getfilesystemencoding()
-            encoded = name.encode(encoding, "replace")
-            if truncate is not None:
-                expected = os.fsdecode(encoded[:truncate])
-            else:
-                expected = os.fsdecode(encoded)
-            return (name, expected)
-
         tests = [
             # test short ASCII name
-            create_test("CustomName"),
+            "CustomName",
 
             # test short non-ASCII name
-            create_test("namé€"),
+            "namé€",
 
             # Test long ASCII names (not truncated)
-            create_test("x" * limit),
+            "x" * limit,
 
             # Test long ASCII names (truncated)
-            create_test("x" * (limit + 10)),
+            "x" * (limit + 10),
 
             # Test long non-ASCII name (truncated)
-            create_test("x" * (limit - 1) + "é€"),
+            "x" * (limit - 1) + "é€",
         ]
         if os_helper.FS_NONASCII:
-            tests.append(create_test(f"nonascii:{os_helper.FS_NONASCII}"))
+            tests.append(f"nonascii:{os_helper.FS_NONASCII}")
         if os_helper.TESTFN_UNENCODABLE:
-            tests.append(create_test(os_helper.TESTFN_UNENCODABLE))
+            tests.append(os_helper.TESTFN_UNENCODABLE)
+
+        if sys.platform.startswith("solaris"):
+            encoding = "utf-8"
+        else:
+            encoding = sys.getfilesystemencoding()
+
+        def work():
+            nonlocal work_name
+            work_name = _thread._get_name()
+
+        for name in tests:
+            encoded = name.encode(encoding, "replace")
+            if truncate is not None:
+                expected = os.fsdecode(encoded[:truncate])
+            else:
+                expected = os.fsdecode(encoded)
 
-        for name, expected in tests:
             with self.subTest(name=name, expected=expected):
                 work_name = None
                 thread = threading.Thread(target=work, name=name)

Modules/_threadmodule.c

@@ -2384,7 +2384,11 @@ _thread__get_name_impl(PyObject *module)
         return PyErr_SetFromErrno(PyExc_OSError);
     }
 
+#ifdef __sun
+    return PyUnicode_DecodeUTF8(name, strlen(name), "surrogateescape");
+#else
     return PyUnicode_DecodeFSDefault(name);
+#endif
 }
 #endif  // HAVE_PTHREAD_GETNAME_NP