Merge branch 'main' into gh-125451-test_processes_terminate

Author: colesbury

Doc/library/argparse.rst

@@ -1808,7 +1808,8 @@ FileType objects
 Argument groups
 ^^^^^^^^^^^^^^^
 
-.. method:: ArgumentParser.add_argument_group(title=None, description=None)
+.. method:: ArgumentParser.add_argument_group(title=None, description=None, *, \
+                                              [argument_default], [conflict_handler])
 
    By default, :class:`ArgumentParser` groups command-line arguments into
    "positional arguments" and "options" when displaying help
@@ -1853,6 +1854,11 @@ Argument groups
 
        --bar BAR  bar help
 
+   The optional, keyword-only parameters argument_default_ and conflict_handler_
+   allow for finer-grained control of the behavior of the argument group. These
+   parameters have the same meaning as in the :class:`ArgumentParser` constructor,
+   but apply specifically to the argument group rather than the entire parser.
+
    Note that any arguments not in your user-defined groups will end up back
    in the usual "positional arguments" and "optional arguments" sections.
 

InternalDocs/compiler.md

@@ -515,7 +515,7 @@ Important files
     Creates C structs corresponding to the ASDL types.  Also contains code for
     marshalling AST nodes (core ASDL types have marshalling code in
     [Python/asdl.c](https://github.com/python/cpython/blob/main/Python/asdl.c)).
-    "File automatically generated by
+    File automatically generated by
     [Parser/asdl_c.py](https://github.com/python/cpython/blob/main/Parser/asdl_c.py).
     This file must be committed separately after every grammar change
     is committed since the ``__version__`` value is set to the latest
@@ -572,7 +572,7 @@ Important files
   * [Include/internal/pycore_ast.h](https://github.com/python/cpython/blob/main/Include/internal/pycore_ast.h)
     : Contains the actual definitions of the C structs as generated by
     [Python/Python-ast.c](https://github.com/python/cpython/blob/main/Python/Python-ast.c)
-    "Automatically generated by
+    Automatically generated by
     [Parser/asdl_c.py](https://github.com/python/cpython/blob/main/Parser/asdl_c.py).
 
   * [Include/internal/pycore_asdl.h](https://github.com/python/cpython/blob/main/Include/internal/pycore_asdl.h)

Lib/pdb.py

@@ -429,8 +429,7 @@ def user_call(self, frame, argument_list):
     def user_line(self, frame):
         """This function is called when we stop or break at this line."""
         if self._wait_for_mainpyfile:
-            if (self.mainpyfile != self.canonic(frame.f_code.co_filename)
-                or frame.f_lineno <= 0):
+            if (self.mainpyfile != self.canonic(frame.f_code.co_filename)):
                 return
             self._wait_for_mainpyfile = False
         self.bp_commands(frame)

Lib/test/test_cmd_line_script.py

@@ -543,7 +543,7 @@ def test_pep_409_verbiage(self):
         script = textwrap.dedent("""\
             try:
                 raise ValueError
-            except:
+            except ValueError:
                 raise NameError from None
             """)
         with os_helper.temp_dir() as script_dir:

Lib/test/test_concurrent_futures/test_shutdown.py

@@ -253,6 +253,9 @@ def test_cancel_futures_wait_false(self):
 
 
 class ProcessPoolShutdownTest(ExecutorShutdownTest):
+    # gh-125451: 'lock' cannot be serialized, the test is broken
+    # and hangs randomly
+    @unittest.skipIf(True, "broken test")
     def test_processes_terminate(self):
         def acquire_lock(lock):
             lock.acquire()

Lib/test/test_coroutines.py

@@ -1185,7 +1185,7 @@ async def f():
         async def g():
             try:
                 raise KeyError
-            except:
+            except KeyError:
                 return await f()
 
         _, result = run_async(g())

Lib/test/test_ctypes/test_libc.py

@@ -23,7 +23,7 @@ def test_sqrt(self):
         self.assertEqual(lib.my_sqrt(2.0), math.sqrt(2.0))
 
     @unittest.skipUnless(hasattr(ctypes, "c_double_complex"),
-                         "requires C11 complex type")
+                         "requires C11 complex type and libffi >= 3.3.0")
     def test_csqrt(self):
         lib.my_csqrt.argtypes = ctypes.c_double_complex,
         lib.my_csqrt.restype = ctypes.c_double_complex

Lib/test/test_file.py

@@ -126,7 +126,7 @@ def testMethods(self):
         # it must also return None if an exception was given
         try:
             1/0
-        except:
+        except ZeroDivisionError:
             self.assertEqual(self.f.__exit__(*sys.exc_info()), None)
 
     def testReadWhenWriting(self):

Lib/test/test_listcomps.py

@@ -609,7 +609,7 @@ def test_comp_in_try_except(self):
             result = snapshot = None
             try:
                 result = [{func}(value) for value in value]
-            except:
+            except ValueError:
                 snapshot = value
                 raise
         """
@@ -643,7 +643,7 @@ def test_exception_in_post_comp_call(self):
             value = [1, None]
             try:
                 [v for v in value].sort()
-            except:
+            except TypeError:
                 pass
         """
         self._check_in_scopes(code, {"value": [1, None]})

Lib/test/test_logging.py

@@ -4877,7 +4877,7 @@ def test_formatting(self):
         r.addHandler(h)
         try:
             raise RuntimeError('deliberate mistake')
-        except:
+        except RuntimeError:
             logging.exception('failed', stack_info=True)
         r.removeHandler(h)
         h.close()