Fixes issue #15803: incorrect `ConfigParser.items()` docstring

diff --git a/Lib/configparser.py b/Lib/configparser.py
index d148b886a2192ffc796662f864497d844c54ea95..06d594a4317c5a1783c3875bf8e85c201853e462 100644 (file)
--- a/Lib/configparser.py
+++ b/Lib/configparser.py
@@ -99,10 +99,9 @@ ConfigParser -- responsible for parsing a list of
         yes, on for True).  Returns False or True.
 
     items(section=_UNSET, raw=False, vars=None)
-        If section is given, return a list of tuples with (section_name,
-        section_proxy) for each section, including DEFAULTSECT. Otherwise,
-        return a list of tuples with (name, value) for each option
-        in the section.
+        If section is given, return a list of tuples with (name, value) for
+        each option in the section. Otherwise, return a list of tuples with
+        (section_name, section_proxy) for each section, including DEFAULTSECT.
 
     remove_section(section)
         Remove the given file section and all its options.

diff --git a/Misc/ACKS b/Misc/ACKS
index f9c75ab36fb88a446c6ba5c7828ddae09b21978a..dc591dafe69d0d87320d55049f5dd5626d0ffb44 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1078,6 +1078,7 @@ Erik Tollerud
 Matias Torchinsky
 Sandro Tosi
 Richard Townsend
+Nathan Trapuzzano
 Laurence Tratt
 John Tromp
 Jason Trowbridge