From f4433303a82b8ed960930227ab06a404e1f8dbec Mon Sep 17 00:00:00 2001 From: Skip Montanaro Date: Fri, 2 Aug 2002 15:52:30 +0000 Subject: [PATCH] testGetServByName shouldn't check for getservbyname - the socket module should always have it. --- Lib/test/test_socket.py | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index b4bb293213..737b4310d6 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -259,24 +259,23 @@ class GeneralModuleTests(unittest.TestCase): 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 + # 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): """Testing default timeout.""" -- 2.50.0