Clean up after paramiko client objects as they do not close correctly by themselves. Updated changelog.

Author: Pan

Changelog.rst

@@ -15,6 +15,7 @@ Fixes
 
 * Remote path for SFTP operations was created incorrectly on Windows - #88 - thanks @moscoquera
 * Parallel client key error when openssh config with a host name override was used - #93
+* Clean up after paramiko clients
 
 1.1.1
 ++++++

pssh/ssh_client.py

@@ -138,6 +138,12 @@ def __init__(self, host,
         else:
             self._connect(self.client, real_host, self.port, **paramiko_kwargs)
 
+    def __del__(self):
+        try:
+            self.client.close()
+        except Exception:
+            pass
+
     def _connect_tunnel(self, host, **paramiko_kwargs):
         """Connects to SSH server via an intermediate SSH tunnel server.
         client (me) -> tunnel (ssh server to proxy through) ->

pssh/utils.py

@@ -60,14 +60,17 @@ def load_private_key(_pkey):
     :type pkey: file/str"""
     if not hasattr(_pkey, 'read'):
         _pkey = open(_pkey)
-    for keytype in [RSAKey, DSSKey, ECDSAKey]:
-        try:
-            pkey = keytype.from_private_key(_pkey)
-        except SSHException:
-            _pkey.seek(0)
-            continue
-        else:
-            return pkey
+    try:
+        for keytype in [RSAKey, DSSKey, ECDSAKey]:
+            try:
+                pkey = keytype.from_private_key(_pkey)
+            except SSHException:
+                _pkey.seek(0)
+                continue
+            else:
+                return pkey
+    finally:
+        _pkey.close()
     logger.error("Failed to load private key using all available key types "
                  "- giving up..")