[Python-checkins] CVS: python/dist/src/Lib binhex.py,1.20,1.20.6.1 codecs.py,1.16.6.1,1.16.6.2 ftplib.py,1.53.4.1,1.53.4.2 httplib.py,1.34.4.2,1.34.4.3 poplib.py,1.14.6.1,1.14.6.2 pstats.py,1.15.4.2,1.15.4.3 smtplib.py,1.36.6.1,1.36.6.2 sndhdr.py,1.6,1.6.6.1 telnetlib.py,1.11.6.1,1.11.6.2
Tim Peters
tim_one@users.sourceforge.net
Wed, 01 Aug 2001 19:40:44 -0700
Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv23606/descr/dist/src/Lib
Modified Files:
Tag: descr-branch
binhex.py codecs.py ftplib.py httplib.py poplib.py pstats.py
smtplib.py sndhdr.py telnetlib.py
Log Message:
Mrege of trunk tag delta date2001-07-30 to date2001-08-01.
Index: binhex.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/binhex.py,v
retrieving revision 1.20
retrieving revision 1.20.6.1
diff -C2 -d -r1.20 -r1.20.6.1
*** binhex.py 2001/02/10 00:06:00 1.20
--- binhex.py 2001/08/02 02:40:42 1.20.6.1
***************
*** 93,97 ****
data = open(name).read(256)
for c in data:
! if not c.isspace() and (c<' ' or ord(c) > 0177):
break
else:
--- 93,97 ----
data = open(name).read(256)
for c in data:
! if not c.isspace() and (c<' ' or ord(c) > 0x7f):
break
else:
Index: codecs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/codecs.py,v
retrieving revision 1.16.6.1
retrieving revision 1.16.6.2
diff -C2 -d -r1.16.6.1 -r1.16.6.2
*** codecs.py 2001/07/06 07:01:30 1.16.6.1
--- codecs.py 2001/08/02 02:40:42 1.16.6.2
***************
*** 576,579 ****
--- 576,585 ----
return m
+ # Tell modulefinder that using codecs probably needs the encodings
+ # package
+ _false = 0
+ if _false:
+ import encodings
+
### Tests
Index: ftplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/ftplib.py,v
retrieving revision 1.53.4.1
retrieving revision 1.53.4.2
diff -C2 -d -r1.53.4.1 -r1.53.4.2
*** ftplib.py 2001/07/28 05:02:58 1.53.4.1
--- ftplib.py 2001/08/02 02:40:42 1.53.4.2
***************
*** 116,119 ****
--- 116,120 ----
if port: self.port = port
self.passiveserver = 0
+ msg = "getaddrinfo returns an empty list"
for res in socket.getaddrinfo(self.host, self.port, 0, socket.SOCK_STREAM):
af, socktype, proto, canonname, sa = res
***************
*** 271,274 ****
--- 272,276 ----
def makeport(self):
'''Create a new socket and send a PORT command for it.'''
+ msg = "getaddrinfo returns an empty list"
for res in socket.getaddrinfo(None, 0, self.af, socket.SOCK_STREAM, 0, socket.AI_PASSIVE):
af, socktype, proto, canonname, sa = res
Index: httplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/httplib.py,v
retrieving revision 1.34.4.2
retrieving revision 1.34.4.3
diff -C2 -d -r1.34.4.2 -r1.34.4.3
*** httplib.py 2001/07/28 05:02:58 1.34.4.2
--- httplib.py 2001/08/02 02:40:42 1.34.4.3
***************
*** 358,361 ****
--- 358,362 ----
def connect(self):
"""Connect to the host and port specified in __init__."""
+ msg = "getaddrinfo returns an empty list"
for res in socket.getaddrinfo(self.host, self.port, 0, socket.SOCK_STREAM):
af, socktype, proto, canonname, sa = res
Index: poplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/poplib.py,v
retrieving revision 1.14.6.1
retrieving revision 1.14.6.2
diff -C2 -d -r1.14.6.1 -r1.14.6.2
*** poplib.py 2001/07/28 05:02:58 1.14.6.1
--- poplib.py 2001/08/02 02:40:42 1.14.6.2
***************
*** 76,79 ****
--- 76,80 ----
self.host = host
self.port = port
+ msg = "getaddrinfo returns an empty list"
for res in socket.getaddrinfo(self.host, self.port, 0, socket.SOCK_STREAM):
af, socktype, proto, canonname, sa = res
Index: pstats.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pstats.py,v
retrieving revision 1.15.4.2
retrieving revision 1.15.4.3
diff -C2 -d -r1.15.4.2 -r1.15.4.3
*** pstats.py 2001/07/30 04:08:14 1.15.4.2
--- pstats.py 2001/08/02 02:40:42 1.15.4.3
***************
*** 641,644 ****
--- 641,646 ----
print "Sort profile data according to specified keys."
print "(Typing `sort' without arguments lists valid keys.)"
+ def complete_sort(self, text, *args):
+ return [a for a in Stats.sort_arg_dict_default.keys() if a.startswith(text)]
def do_stats(self, line):
Index: smtplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/smtplib.py,v
retrieving revision 1.36.6.1
retrieving revision 1.36.6.2
diff -C2 -d -r1.36.6.1 -r1.36.6.2
*** smtplib.py 2001/07/28 05:02:59 1.36.6.1
--- smtplib.py 2001/08/02 02:40:42 1.36.6.2
***************
*** 218,221 ****
--- 218,222 ----
if not port: port = SMTP_PORT
if self.debuglevel > 0: print 'connect:', (host, port)
+ msg = "getaddrinfo returns an empty list"
for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
af, socktype, proto, canonname, sa = res
Index: sndhdr.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/sndhdr.py,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -C2 -d -r1.6 -r1.6.6.1
*** sndhdr.py 2001/02/15 22:15:13 1.6
--- sndhdr.py 2001/08/02 02:40:42 1.6.6.1
***************
*** 41,45 ****
def whathdr(filename):
"""Recognize sound headers"""
! f = open(filename, 'r')
h = f.read(512)
for tf in tests:
--- 41,45 ----
def whathdr(filename):
"""Recognize sound headers"""
! f = open(filename, 'rb')
h = f.read(512)
for tf in tests:
Index: telnetlib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/telnetlib.py,v
retrieving revision 1.11.6.1
retrieving revision 1.11.6.2
diff -C2 -d -r1.11.6.1 -r1.11.6.2
*** telnetlib.py 2001/07/28 05:02:59 1.11.6.1
--- telnetlib.py 2001/08/02 02:40:42 1.11.6.2
***************
*** 137,140 ****
--- 137,141 ----
self.host = host
self.port = port
+ msg = "getaddrinfo returns an empty list"
for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
af, socktype, proto, canonname, sa = res