[Python-checkins] python/dist/src/Lib/test test_socket.py,1.23,1.23.6.1

2003年6月21日 08:59:03 -0700

Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv26430
Modified Files:
 Tag: release22-maint
	test_socket.py 
Log Message:
check getservbyname with several protocols, not just telnet
Index: test_socket.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_socket.py,v
retrieving revision 1.23
retrieving revision 1.23.6.1
diff -C2 -d -r1.23 -r1.23.6.1
*** test_socket.py	9 Dec 2001 08:57:46 -0000	1.23
--- test_socket.py	21 Jun 2003 15:59:01 -0000	1.23.6.1
***************
*** 85,93 ****
 
 if hasattr(socket, 'getservbyname'):
! print socket.getservbyname('telnet', 'tcp')
 try:
! socket.getservbyname('telnet', 'udp')
! except socket.error:
 pass
 
 import sys
--- 85,102 ----
 
 if hasattr(socket, 'getservbyname'):
! # try a few protocols - not everyone has telnet enabled
! class Found(Exception): pass
 try:
! for proto in ("telnet", "ssh", "www", "ftp"):
! for how in ("tcp", "udp"):
! try:
! socket.getservbyname(proto, how)
! raise Found
! except socket.error:
! pass
! except Found:
 pass
+ else:
+ print "socket.error", "socket.getservbyname failed"
 
 import sys