From: Barry Warsaw <barry@python.org>
Date: Fri, 23 Mar 2001 17:40:16 +0000 (+0000)
Subject: Make socket.getservbyname test optional on socket module having that
X-Git-Tag: v2.1b2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6870bba459a7c30908c8640b20023e9817e8ac53;p=thirdparty%2FPython%2Fcpython.git

Make socket.getservbyname test optional on socket module having that
attribute.  Jython does not have this function.

Closes SF patch #403667.
---

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 00a4a9121390..10cd5d879545 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -83,11 +83,12 @@ for name in all_host_names:
 else:
     print 'FQDN not found'
 
-print socket.getservbyname('telnet', 'tcp')
-try:
-    socket.getservbyname('telnet', 'udp')
-except socket.error:
-    pass
+if hasattr(socket, 'getservbyname'):
+    print socket.getservbyname('telnet', 'tcp')
+    try:
+        socket.getservbyname('telnet', 'udp')
+    except socket.error:
+        pass
 
 
 canfork = hasattr(os, 'fork')