Fix merge conflicts.

python · pablogsal · Apr 21, 2025 · Dec 21, 2024 · Dec 21, 2024 · Dec 21, 2024
commit 4feaf09e6d68ef328eb053815d241f7a5afd492e
diff --git a/Doc/whatsnew/3.14.rst b/Doc/whatsnew/3.14.rst
@@ -677,14 +677,18 @@ errno
 * Add :data:`errno.EHWPOISON` error code.
   (Contributed by James Roy in :gh:`126585`.)
 
-    
 faulthandler
 ------------
 
 * Add support for printing the C stack trace on systems that support it via
   :func:`faulthandler.dump_c_stack` or via the *c_stack* argument in :func:`faulthandler.enable`.
   (Contributed by Peter Bierma in :gh:`127604`.)
 
+fnmatch
+-------
+
+* Added :func:`fnmatch.filterfalse` for excluding names matching a pattern.
+  (Contributed by Bénédikt Tran in :gh:`74598`.)
 
 fractions
 ---------

diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py
@@ -124,9 +124,9 @@ def check_error(self, code, lineno, fatal_error, *,
         )
         if all_threads and not all_threads_disabled:
             if know_current_thread:
-                header = f'Current thread {ADDRESS_EXPR}'
+                header = CURRENT_THREAD_HEADER
             else:
-                header = f'Thread {ADDRESS_EXPR}'
+                header = THREAD_HEADER
         else:
             header = STACK_HEADER
         regex = [f'^{fatal_error}']
@@ -135,9 +135,7 @@ def check_error(self, code, lineno, fatal_error, *,
         regex.append('')
         if all_threads_disabled and not py_fatal_error:
             regex.append("<Cannot show all threads while the GIL is disabled>")
-        regex.append(fr'{header} \(most recent call first\):')
-        if garbage_collecting:
-            regex.append('  Garbage-collecting')
+        regex.append(fr'{header}')
         if support.Py_GIL_DISABLED and py_fatal_error and not know_current_thread:
             regex.append("  <tstate is freed>")
         else: