[Python-checkins] cpython (2.7): #13163: fix names of _get_socket args

[Eric V. Smith]

On 04/02/2013 12:15 PM, r.david.murray wrote:
> http://hg.python.org/cpython/rev/5d99042bd40f
> changeset:   83061:5d99042bd40f
> branch:      2.7
> parent:      83049:240c83902fca
> user:        R David Murray <rdmurray at bitdance.com>
> date:        Tue Apr 02 12:15:07 2013 -0400
> summary:
>   #13163: fix names of _get_socket args
> 
> This was already done in Python3, but having it wrong leads to
> incorrect debug output, so it seems worth fixing in 2.7 as well.
> 
> Patch by Victor Terrón.
> 
> files:
>   Doc/library/email.mime.rst |  9 +++++++++
>   Lib/smtplib.py             |  4 ++--
>   Misc/ACKS                  |  1 +
>   Misc/NEWS                  |  3 +++
>   4 files changed, 15 insertions(+), 2 deletions(-)
> 
> 
> diff --git a/Doc/library/email.mime.rst b/Doc/library/email.mime.rst
> --- a/Doc/library/email.mime.rst
> +++ b/Doc/library/email.mime.rst
> @@ -199,3 +199,12 @@
>        Transfer Encoding now happens implicitly based on the *_charset*
>        argument.
>  
> +   Unless the ``_charset`` parameter is explicitly set to ``None``, the
> +   MIMEText object created will have both a :mailheader:`Content-Type` header
> +   with a ``charset`` parameter, and a :mailheader:`Content-Transfer-Endcoding`
> +   header.  This means that a subsequent ``set_payload`` call will not result
> +   in an encoded payload, even if a charset is passed in the ``set_payload``
> +   command.  You can "reset" this behavior by deleting the
> +   ``Content-Transfer-Encoding`` header, after which a ``set_payload`` call
> +   will automatically encode the new payload (and add a new
> +   :mailheader:`Content-Transfer-Encoding` header).

I think this part of the changeset might have been unintentional.

Eric.