summaryrefslogtreecommitdiffhomepage
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
commit1509dcd598452da3c645f49aec51a10c9ffc1629 (patch)
tree126d77a120ed46cdea915769805be361a96f2462 /paramiko/agent.py
parenteebcffa504bec99961ce792a37bc0d5f0c97506c (diff)
parenta832b28c0df5e7d9c9ab8f0aa5e01c0e4f090787 (diff)
Merge branch '1.14' into 1.15
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 4f463449..a75ac59e 100644
--- a/paramiko/agent.py
+++ b/paramiko/agent.py
@@ -73,7 +73,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 = ()