[Python-checkins] python/dist/src/Lib/test test_socket.py,1.48,1.49

[montanaro@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv15812

Modified Files:
	test_socket.py 
Log Message:
testGetServByName shouldn't check for getservbyname - the socket module
should always have it.


Index: test_socket.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_socket.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** test_socket.py	2 Aug 2002 02:19:46 -0000	1.48
--- test_socket.py	2 Aug 2002 15:52:30 -0000	1.49
***************
*** 260,281 ****
      def testGetServByName(self):
          """Testing getservbyname()."""
!         if hasattr(socket, 'getservbyname'):
!             # try a few protocols - not everyone has telnet enabled
!             found = 0
!             for proto in ("telnet", "ssh", "www", "ftp"):
!                 try:
!                     socket.getservbyname(proto, 'tcp')
!                     found = 1
!                     break
!                 except socket.error:
!                     pass
!                 try:
!                     socket.getservbyname(proto, 'udp')
!                     found = 1
!                     break
!                 except socket.error:
!                     pass
!                 if not found:
!                     raise socket.error
  
      def testDefaultTimeout(self):
--- 260,280 ----
      def testGetServByName(self):
          """Testing getservbyname()."""
!         # try a few protocols - not everyone has telnet enabled
!         found = 0
!         for proto in ("telnet", "ssh", "www", "ftp"):
!             try:
!                 socket.getservbyname(proto, 'tcp')
!                 found = 1
!                 break
!             except socket.error:
!                 pass
!             try:
!                 socket.getservbyname(proto, 'udp')
!                 found = 1
!                 break
!             except socket.error:
!                 pass
!             if not found:
!                 raise socket.error
  
      def testDefaultTimeout(self):