From: Łukasz Langa <lukasz@langa.pl>
Date: Mon, 31 Dec 2012 01:18:20 +0000 (+0100)
Subject: Fixes issue #15803: incorrect `ConfigParser.items()` docstring
X-Git-Tag: v3.3.1rc1~455^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30574695067f948c2ee40d44c06d71e16c6b90f9;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/configparser.py b/Lib/configparser.py
index d148b886a219..06d594a4317c 100644
--- 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 f9c75ab36fb8..dc591dafe69d 100644
--- 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