Client: clean up open connections when deleting

smurfix · lavagetto · commit 7c35b2df3ce7 · 2015-11-15T11:18:03.000+01:00
Otherwise you get some warnings about still-open connections from Python3.
diff --git a/src/etcd/client.py b/src/etcd/client.py
@@ -43,6 +43,9 @@ class Client(object):
     _comparison_conditions = set(('prevValue', 'prevIndex', 'prevExist'))
     _read_options = set(('recursive', 'wait', 'waitIndex', 'sorted', 'quorum'))
     _del_conditions = set(('prevValue', 'prevIndex'))
+
+    http = None
+
     def __init__(
             self,
             host='127.0.0.1',
@@ -199,6 +202,11 @@ def _discover(self, domain):
             raise ValueError("The SRV record is present but no host were found")
         return tuple(hosts)
 
+    def __del__(self):
+        """Clean up open connections"""
+        if self.http is not None:
+            self.http.clear()
+
     @property
     def base_uri(self):
         """URI used by the client to connect to etcd."""
@@ -783,7 +791,7 @@ def api_execute(self, path, method, params=None, timeout=None):
                 else:
                     raise etcd.EtcdException(
                         'HTTP method {} not supported'.format(method))
-                
+
                 # Check the cluster ID hasn't changed under us.  We use
                 # preload_content=False above so we can read the headers
                 # before we wait for the content of a watch.
@@ -823,7 +831,7 @@ def api_execute(self, path, method, params=None, timeout=None):
             except:
                 _log.exception("Unexpected request failure, re-raising.")
                 raise
-            
+
         if some_request_failed:
             if not self._use_proxies:
                 # The cluster may have changed since last invocation
