From e6ce82e67711fbfb0f10eed250ae4763ec7deb28 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Wed, 17 Dec 2014 13:46:26 -0800 Subject: Explicitly close agent connection in top level agent class. Fixes #459 --- paramiko/agent.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/paramiko/agent.py b/paramiko/agent.py index 2b11337f..e77b7281 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 = () -- cgit v1.2.3 From 8f2d8c044463ef0620f91d4eafa118e4d6960b1c Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Wed, 17 Dec 2014 13:47:18 -0800 Subject: Changelog re #459 --- sites/www/changelog.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 3f05caf7..3738874d 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`` -- cgit v1.2.3