summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--paramiko/agent.py3
-rw-r--r--sites/www/changelog.rst3
2 files changed, 5 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 = ()
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 1903f5cc..9a07c588 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
Changelog
=========
+* :bug:`459` Tighten up agent connection closure behavior to avoid spurious
+ ``ResourceWarning`` display in some situations. Thanks to ``@tkrapp`` for the
+ catch.
* :bug:`429` Server-level debug message logging was overlooked during the
Python 3 compatibility update; Python 3 clients attempting to log SSH debug
packets encountered type errors. This is now fixed. Thanks to ``@mjmaenpaa``