summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-04-02 16:15:07 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-04-02 16:15:07 (GMT)
commitc993a1948043af043bec8e8230abd68200a863b1 (patch)
treeadc0f5b69bfa4921b3a7a01e7a7e836bd60d9fbc /Lib
parent34d0c66ef2bcfae00beb9f2b14e393cd00f499e4 (diff)
downloadcpython-c993a1948043af043bec8e8230abd68200a863b1.zip
cpython-c993a1948043af043bec8e8230abd68200a863b1.tar.gz
cpython-c993a1948043af043bec8e8230abd68200a863b1.tar.bz2
#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.
Diffstat (limited to 'Lib')
-rwxr-xr-xLib/smtplib.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 099e54a..9e8bc72 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.