[Python-checkins] CVS: python/dist/src/Lib ftplib.py,1.41,1.42 gopherlib.py,1.6,1.7 httplib.py,1.14,1.15 imaplib.py,1.19,1.20 nntplib.py,1.18,1.19 poplib.py,1.7,1.8 smtplib.py,1.22,1.23
Guido van Rossum
python-dev@python.org
2000年3月28日 16:45:49 -0500 (EST)
Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/home/guido/hp/mal/py-patched/Lib
Modified Files:
ftplib.py gopherlib.py httplib.py imaplib.py nntplib.py
poplib.py smtplib.py
Log Message:
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...
Index: ftplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/ftplib.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** ftplib.py 2000年02月28日 15:12:25 1.41
--- ftplib.py 2000年03月28日 21:45:45 1.42
***************
*** 116,120 ****
self.passiveserver = 0
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! self.sock.connect(self.host, self.port)
self.file = self.sock.makefile('rb')
self.welcome = self.getresp()
--- 116,120 ----
self.passiveserver = 0
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! self.sock.connect((self.host, self.port))
self.file = self.sock.makefile('rb')
self.welcome = self.getresp()
***************
*** 266,270 ****
host, port = parse227(self.sendcmd('PASV'))
conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! conn.connect(host, port)
resp = self.sendcmd(cmd)
if resp[0] <> '1':
--- 266,270 ----
host, port = parse227(self.sendcmd('PASV'))
conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! conn.connect((host, port))
resp = self.sendcmd(cmd)
if resp[0] <> '1':
Index: gopherlib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/gopherlib.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** gopherlib.py 2000年02月04日 15:10:32 1.6
--- gopherlib.py 2000年03月28日 21:45:45 1.7
***************
*** 67,71 ****
port = string.atoi(port)
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! s.connect(host, port)
s.send(selector + CRLF)
s.shutdown(1)
--- 67,71 ----
port = string.atoi(port)
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! s.connect((host, port))
s.send(selector + CRLF)
s.shutdown(1)
Index: httplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/httplib.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** httplib.py 2000年02月10日 17:17:13 1.14
--- httplib.py 2000年03月28日 21:45:45 1.15
***************
*** 110,114 ****
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
if self.debuglevel > 0: print 'connect:', (host, port)
! self.sock.connect(host, port)
def send(self, str):
--- 110,114 ----
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
if self.debuglevel > 0: print 'connect:', (host, port)
! self.sock.connect((host, port))
def send(self, str):
***************
*** 210,214 ****
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
if self.debuglevel > 0: print 'connect:', (host, port)
! sock.connect(host, port)
ssl = socket.ssl(sock, self.key_file, self.cert_file)
self.sock = FakeSocket(sock, ssl)
--- 210,214 ----
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
if self.debuglevel > 0: print 'connect:', (host, port)
! sock.connect((host, port))
ssl = socket.ssl(sock, self.key_file, self.cert_file)
self.sock = FakeSocket(sock, ssl)
Index: imaplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/imaplib.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** imaplib.py 2000年03月28日 20:20:53 1.19
--- imaplib.py 2000年03月28日 21:45:46 1.20
***************
*** 192,196 ****
"""Setup 'self.sock' and 'self.file'."""
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! self.sock.connect(self.host, self.port)
self.file = self.sock.makefile('r')
--- 192,196 ----
"""Setup 'self.sock' and 'self.file'."""
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! self.sock.connect((self.host, self.port))
self.file = self.sock.makefile('r')
Index: nntplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/nntplib.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** nntplib.py 2000年02月10日 20:25:53 1.18
--- nntplib.py 2000年03月28日 21:45:46 1.19
***************
*** 109,113 ****
self.port = port
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! self.sock.connect(self.host, self.port)
self.file = self.sock.makefile('rb')
self.debugging = 0
--- 109,113 ----
self.port = port
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! self.sock.connect((self.host, self.port))
self.file = self.sock.makefile('rb')
self.debugging = 0
Index: poplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/poplib.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** poplib.py 2000年02月28日 15:12:25 1.7
--- poplib.py 2000年03月28日 21:45:46 1.8
***************
*** 78,82 ****
self.port = port
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! self.sock.connect(self.host, self.port)
self.file = self.sock.makefile('rb')
self._debugging = 0
--- 78,82 ----
self.port = port
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! self.sock.connect((self.host, self.port))
self.file = self.sock.makefile('rb')
self._debugging = 0
Index: smtplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/smtplib.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** smtplib.py 2000年02月28日 15:12:25 1.22
--- smtplib.py 2000年03月28日 21:45:46 1.23
***************
*** 214,218 ****
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
if self.debuglevel > 0: print 'connect:', (host, port)
! self.sock.connect(host, port)
(code,msg)=self.getreply()
if self.debuglevel >0 : print "connect:", msg
--- 214,218 ----
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
if self.debuglevel > 0: print 'connect:', (host, port)
! self.sock.connect((host, port))
(code,msg)=self.getreply()
if self.debuglevel >0 : print "connect:", msg