Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 21:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fredrik Lundh:

Browse source 
This fixes a bunch of socket.connect(host, post) calls.  Note that I
haven't tested all modules -- I don't have enough servers here...
This commit is contained in:
Guido van Rossum 2000-03-28 21:45:46 +00:00
parent 1916b35f58
commit 93a7c0fe6b
7 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/ftplib.py
View file

@ -115,7 +115,7 @@ def connect(self, host = '', port = 0):
if port: self.port = port if port: self.port = port
self.passiveserver = 0 self.passiveserver = 0
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.sock.connect(self.host, self.port) self.sock.connect((self.host, self.port))
self.file = self.sock.makefile('rb') self.file = self.sock.makefile('rb')
self.welcome = self.getresp() self.welcome = self.getresp()
return self.welcome return self.welcome
@ -265,7 +265,7 @@ def ntransfercmd(self, cmd):
if self.passiveserver: if self.passiveserver:
host, port = parse227(self.sendcmd('PASV')) host, port = parse227(self.sendcmd('PASV'))
conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM) conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
conn.connect(host, port) conn.connect((host, port))
resp = self.sendcmd(cmd) resp = self.sendcmd(cmd)
if resp[0] <> '1': if resp[0] <> '1':
raise error_reply, resp raise error_reply, resp

2
Lib/gopherlib.py
View file

@ -66,7 +66,7 @@ def send_selector(selector, host, port = 0):
elif type(port) == type(''): elif type(port) == type(''):
port = string.atoi(port) port = string.atoi(port)
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.connect(host, port) s.connect((host, port))
s.send(selector + CRLF) s.send(selector + CRLF)
s.shutdown(1) s.shutdown(1)
return s.makefile('rb') return s.makefile('rb')

4
Lib/httplib.py
View file

@ -109,7 +109,7 @@ def connect(self, host, port = 0):
if not port: port = HTTP_PORT if not port: port = HTTP_PORT
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
if self.debuglevel > 0: print 'connect:', (host, port) if self.debuglevel > 0: print 'connect:', (host, port)
self.sock.connect(host, port) self.sock.connect((host, port))
def send(self, str): def send(self, str):
"""Send `str' to the server.""" """Send `str' to the server."""
@ -209,7 +209,7 @@ def connect(self, host, port = 0):
if not port: port = HTTPS_PORT if not port: port = HTTPS_PORT
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
if self.debuglevel > 0: print 'connect:', (host, port) if self.debuglevel > 0: print 'connect:', (host, port)
sock.connect(host, port) sock.connect((host, port))
ssl = socket.ssl(sock, self.key_file, self.cert_file) ssl = socket.ssl(sock, self.key_file, self.cert_file)
self.sock = FakeSocket(sock, ssl) self.sock = FakeSocket(sock, ssl)

2
Lib/imaplib.py
View file

@ -191,7 +191,7 @@ def __getattr__(self, attr):
def open(self, host, port): def open(self, host, port):
"""Setup 'self.sock' and 'self.file'.""" """Setup 'self.sock' and 'self.file'."""
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.sock.connect(self.host, self.port) self.sock.connect((self.host, self.port))
self.file = self.sock.makefile('r') self.file = self.sock.makefile('r')

2
Lib/nntplib.py
View file

@ -108,7 +108,7 @@ def __init__(self, host, port=NNTP_PORT, user=None, password=None,
self.host = host self.host = host
self.port = port self.port = port
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.sock.connect(self.host, self.port) self.sock.connect((self.host, self.port))
self.file = self.sock.makefile('rb') self.file = self.sock.makefile('rb')
self.debugging = 0 self.debugging = 0
self.welcome = self.getresp() self.welcome = self.getresp()

2
Lib/poplib.py
View file

@ -77,7 +77,7 @@ def __init__(self, host, port = POP3_PORT):
self.host = host self.host = host
self.port = port self.port = port
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.sock.connect(self.host, self.port) self.sock.connect((self.host, self.port))
self.file = self.sock.makefile('rb') self.file = self.sock.makefile('rb')
self._debugging = 0 self._debugging = 0
self.welcome = self._getresp() self.welcome = self._getresp()

2
Lib/smtplib.py
View file

@ -213,7 +213,7 @@ def connect(self, host='localhost', port = 0):
if not port: port = SMTP_PORT if not port: port = SMTP_PORT
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
if self.debuglevel > 0: print 'connect:', (host, port) if self.debuglevel > 0: print 'connect:', (host, port)
self.sock.connect(host, port) self.sock.connect((host, port))
(code,msg)=self.getreply() (code,msg)=self.getreply()
if self.debuglevel >0 : print "connect:", msg if self.debuglevel >0 : print "connect:", msg
return (code,msg) return (code,msg)