[Python-checkins] cpython (merge 3.3 -> default): Merged fix for #15803 from 3.2 through 3.3

[lukasz.langa]

http://hg.python.org/cpython/rev/b4975cb4be95
changeset:   81163:b4975cb4be95
parent:      81160:e61381137b4a
parent:      81162:cc277b25eae7
user:        Łukasz Langa <lukasz at langa.pl>
date:        Mon Dec 31 02:26:11 2012 +0100
summary:
  Merged fix for #15803 from 3.2 through 3.3

files:
  Lib/configparser.py |  7 +++----
  Misc/ACKS           |  1 +
  2 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Lib/configparser.py b/Lib/configparser.py
--- a/Lib/configparser.py
+++ b/Lib/configparser.py
@@ -99,10 +99,9 @@
         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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1202,6 +1202,7 @@
 Sandro Tosi
 Richard Townsend
 David Townshend
+Nathan Trapuzzano
 Laurence Tratt
 Alberto Trevino
 Matthias Troffaes

-- 
Repository URL: http://hg.python.org/cpython