summaryrefslogtreecommitdiff
path: root/paramiko/agent.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-12-17 13:47:21 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-12-17 13:47:21 -0800
commita832b28c0df5e7d9c9ab8f0aa5e01c0e4f090787 (patch)
treeaaf2044ef2755ef5d501df6e3021d561c3de203e /paramiko/agent.py
parentf29ff012f9530a00800f746cb5f2072642731222 (diff)
parent8f2d8c044463ef0620f91d4eafa118e4d6960b1c (diff)
downloadparamiko-a832b28c0df5e7d9c9ab8f0aa5e01c0e4f090787.tar.gz
Merge branch '1.13' into 1.14
Diffstat (limited to 'paramiko/agent.py')
-rw-r--r--paramiko/agent.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/paramiko/agent.py b/paramiko/agent.py
index 5a08d452..a5356656 100644
--- a/paramiko/agent.py
+++ b/paramiko/agent.py
@@ -72,7 +72,8 @@ class AgentSSH(object):
self._keys = tuple(keys)
def _close(self):
- #self._conn.close()
+ if self._conn is not None:
+ self._conn.close()
self._conn = None
self._keys = ()