Catch socket errors when testing for Database/Server existence

djc · djc · commit 3af398f9fb4c · 2016-09-24T10:17:21.000+02:00
diff --git a/couchdb/client.py b/couchdb/client.py
@@ -31,6 +31,7 @@
 from textwrap import dedent
 import warnings
 import sys
+import socket
 
 from couchdb import http, json, util
 
@@ -95,7 +96,7 @@ def __contains__(self, name):
         try:
             self.resource.head(name)
             return True
-        except http.ResourceNotFound:
+        except (socket.error, http.ResourceNotFound):
             return False
 
     def __iter__(self):
@@ -113,7 +114,7 @@ def __nonzero__(self):
         try:
             self.resource.head()
             return True
-        except http.ResourceNotFound:
+        except (socket.error, http.ResourceNotFound):
             return False
 
     def __bool__(self):
