Fredrik Lundh:
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:
parent
1916b35f58
commit
93a7c0fe6b
|
@ -115,7 +115,7 @@ class FTP:
|
|||
if port: self.port = port
|
||||
self.passiveserver = 0
|
||||
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.welcome = self.getresp()
|
||||
return self.welcome
|
||||
|
@ -265,7 +265,7 @@ class FTP:
|
|||
if self.passiveserver:
|
||||
host, port = parse227(self.sendcmd('PASV'))
|
||||
conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
conn.connect(host, port)
|
||||
conn.connect((host, port))
|
||||
resp = self.sendcmd(cmd)
|
||||
if resp[0] <> '1':
|
||||
raise error_reply, resp
|
||||
|
|
|
@ -66,7 +66,7 @@ def send_selector(selector, host, port = 0):
|
|||
elif type(port) == type(''):
|
||||
port = string.atoi(port)
|
||||
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
s.connect(host, port)
|
||||
s.connect((host, port))
|
||||
s.send(selector + CRLF)
|
||||
s.shutdown(1)
|
||||
return s.makefile('rb')
|
||||
|
|
|
@ -109,7 +109,7 @@ class HTTP:
|
|||
if not port: port = HTTP_PORT
|
||||
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
if self.debuglevel > 0: print 'connect:', (host, port)
|
||||
self.sock.connect(host, port)
|
||||
self.sock.connect((host, port))
|
||||
|
||||
def send(self, str):
|
||||
"""Send `str' to the server."""
|
||||
|
@ -209,7 +209,7 @@ if hasattr(socket, "ssl"):
|
|||
if not port: port = HTTPS_PORT
|
||||
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
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)
|
||||
self.sock = FakeSocket(sock, ssl)
|
||||
|
||||
|
|
|
@ -191,7 +191,7 @@ class IMAP4:
|
|||
def open(self, host, port):
|
||||
"""Setup 'self.sock' and 'self.file'."""
|
||||
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')
|
||||
|
||||
|
||||
|
|
|
@ -108,7 +108,7 @@ class NNTP:
|
|||
self.host = host
|
||||
self.port = port
|
||||
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.debugging = 0
|
||||
self.welcome = self.getresp()
|
||||
|
|
|
@ -77,7 +77,7 @@ class POP3:
|
|||
self.host = host
|
||||
self.port = port
|
||||
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._debugging = 0
|
||||
self.welcome = self._getresp()
|
||||
|
|
|
@ -213,7 +213,7 @@ class SMTP:
|
|||
if not port: port = SMTP_PORT
|
||||
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
if self.debuglevel > 0: print 'connect:', (host, port)
|
||||
self.sock.connect(host, port)
|
||||
self.sock.connect((host, port))
|
||||
(code,msg)=self.getreply()
|
||||
if self.debuglevel >0 : print "connect:", msg
|
||||
return (code,msg)
|
||||
|
|
Loading…
Reference in New Issue