Merge branch 'main' into fix-gh-151949-lzma-sphinx-warnings

Author: fedonman

Doc/library/getopt.rst

@@ -62,6 +62,8 @@ exception:
    option ``--fo`` will match as ``--foo``, but ``--f`` will
    not match uniquely, so :exc:`GetoptError` will be raised.
 
+   If *longopts* is a string it gets treated as a list of a single element.
+
    The return value consists of two elements: the first is a list of ``(option,
    value)`` pairs; the second is the list of program arguments left after the
    option list was stripped (this is a trailing slice of *args*).  Each

Lib/test/test_ctypes/test_structures.py

@@ -958,7 +958,7 @@ class Foo:
     def test_string_annotations(self):
         from test.test_ctypes import struct_str_ann
         Point = struct_str_ann.Point
-        fields = [['x', c_int], ['y', c_int]]
+        fields = [('x', c_int), ('y', c_int)]
         self.assertEqual(Point._fields_, fields)