return empty string on socket error
authorRichard Penman
Mon, 14 Sep 2015 15:19:11 +0100
changeset 65 50b5966b5566
parent 64 2ed54e885571
child 66 07bc0807492c
child 68 6fcd6564d1f8
child 70 1fe2c20adeba
child 80 fa9650e9ec23
return empty string on socket error
whois/whois.py
--- a/whois/whois.py	Mon Sep 14 15:13:50 2015 +0100
+++ b/whois/whois.py	Mon Sep 14 15:19:11 2015 +0100
@@ -122,15 +122,17 @@
             s.close()
         except socket.error as socketerror:
             print 'Socket Error:', socketerror
-        nhost = None
-        response = enforce_ascii(response)
-        if 'with "=xxx"' in response:
-            return self.whois(query, hostname, flags, True)
-        if flags & NICClient.WHOIS_RECURSE and nhost is None:
-            nhost = self.findwhois_server(response.decode(), hostname, query)
-        if nhost is not None:
-            response += self.whois(query, nhost, 0)
-        return response.decode()
+            return ''
+        else:
+            nhost = None
+            response = enforce_ascii(response)
+            if 'with "=xxx"' in response:
+                return self.whois(query, hostname, flags, True)
+            if flags & NICClient.WHOIS_RECURSE and nhost is None:
+                nhost = self.findwhois_server(response.decode(), hostname, query)
+            if nhost is not None:
+                response += self.whois(query, nhost, 0)
+            return response.decode()
 
     def choose_server(self, domain):
         """Choose initial lookup NIC host"""