From: R David Murray <rdmurray@bitdance.com>
Date: Tue, 2 Apr 2013 16:15:07 +0000 (-0400)
Subject: #13163: fix names of _get_socket args
X-Git-Tag: v2.7.5~117
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c993a1948043af043bec8e8230abd68200a863b1;p=thirdparty%2FPython%2Fcpython.git

#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.
---

diff --git a/Doc/library/email.mime.rst b/Doc/library/email.mime.rst
index 5fa82d022de6..957504da44d4 100644
--- a/Doc/library/email.mime.rst
+++ b/Doc/library/email.mime.rst
@@ -199,3 +199,12 @@ Here are the classes:
       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).
diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 099e54a4fa1e..9e8bc72379f2 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -276,12 +276,12 @@ class SMTP:
         """
         self.debuglevel = debuglevel
 
-    def _get_socket(self, port, host, timeout):
+    def _get_socket(self, host, port, timeout):
         # This makes it simpler for SMTP_SSL to use the SMTP connect code
         # and just alter the socket connection bit.
         if self.debuglevel > 0:
             print>>stderr, 'connect:', (host, port)
-        return socket.create_connection((port, host), timeout)
+        return socket.create_connection((host, port), timeout)
 
     def connect(self, host='localhost', port=0):
         """Connect to a host on a given port.
diff --git a/Misc/ACKS b/Misc/ACKS
index 593ba4d23e23..2d6bd07892f9 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -992,6 +992,7 @@ Monty Taylor
 Amy Taylor
 Anatoly Techtonik
 Mikhail Terekhov
+Victor Terrón
 Richard M. Tew
 Tobias Thelen
 Lowe Thiderman
diff --git a/Misc/NEWS b/Misc/NEWS
index 70dd410c2436..ab655ebe0915 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #13163: Rename operands in smtplib.SMTP._get_socket to correct names;
+  fixes otherwise misleading output in tracebacks and when when debug is on.
+
 - Issue #6698: IDLE now opens just an editor window when configured to do so.
 
 - Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer