[Python-checkins] CVS: python/dist/src/Lib httplib.py,1.32,1.33
Jeremy Hylton
jhylton@users.sourceforge.net
Thu, 01 Feb 2001 15:35:22 -0800
Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv31051/Lib
Modified Files:
httplib.py
Log Message:
An ssl-wrapped socket now returns '' on EOF, just like a regular
socket -- as suggested by Clarence Gardner.
Fix httplib to comply with the new ssl-socket interface.
Index: httplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/httplib.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** httplib.py 2001/01/23 15:35:05 1.32
--- httplib.py 2001/02/01 23:35:20 1.33
***************
*** 576,586 ****
raise UnimplementedFileMode()
! msgbuf = ""
while 1:
try:
! msgbuf = msgbuf + self.__ssl.read()
except socket.sslerror, msg:
break
! return StringIO(msgbuf)
def send(self, stuff, flags = 0):
--- 576,589 ----
raise UnimplementedFileMode()
! msgbuf = []
while 1:
try:
! buf = self.__ssl.read()
except socket.sslerror, msg:
break
! if buf == '':
! break
! msgbuf.append(buf)
! return StringIO("".join(msgbuf))
def send(self, stuff, flags = 0):
***************
*** 810,813 ****
--- 813,817 ----
if hasattr(socket, 'ssl'):
host = 'sourceforge.net'
+ selector = '/projects/python'
hs = HTTPS()
hs.connect(host)