backport patch [ 1252706 ] poplib list() docstring fix (and docs too)

diff --git a/Doc/lib/libpoplib.tex b/Doc/lib/libpoplib.tex
index e10ee341a117180311cdeecba915d11a1389a506..25570ae7250da828244c4921b68a1601e0ccbb54 100644 (file)
--- a/Doc/lib/libpoplib.tex
+++ b/Doc/lib/libpoplib.tex
@@ -108,8 +108,8 @@ Get mailbox status.  The result is a tuple of 2 integers:
 
 \begin{methoddesc}{list}{\optional{which}}
 Request message list, result is in the form
-\code{(\var{response}, ['mesg_num octets', ...])}.  If \var{which} is
-set, it is the message to list.
+\code{(\var{response}, ['mesg_num octets', ...], \var{octets})}.
+If \var{which} is set, it is the message to list.
 \end{methoddesc}
 
 \begin{methoddesc}{retr}{which}

diff --git a/Lib/poplib.py b/Lib/poplib.py
index 1475bdce875d403d1afbab59b445ce541edbf7c8..202c6e00548dcb5b35f117f2833779a0d1a372b0 100644 (file)
--- a/Lib/poplib.py
+++ b/Lib/poplib.py
@@ -219,7 +219,7 @@ class POP3:
         """Request listing, return result.
 
         Result without a message number argument is in form
-        ['response', ['mesg_num octets', ...]].
+        ['response', ['mesg_num octets', ...], octets].
 
         Result when a message number argument is given is a
         single response: the "scan listing" for that message.