testGetServByName shouldn't check for getservbyname - the socket module
should always have it.
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index b4bb293..737b431 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -259,24 +259,23 @@
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."""