diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-12-17 13:47:21 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-12-17 13:47:21 -0800 |
| commit | 1509dcd598452da3c645f49aec51a10c9ffc1629 (patch) | |
| tree | 126d77a120ed46cdea915769805be361a96f2462 | |
| parent | eebcffa504bec99961ce792a37bc0d5f0c97506c (diff) | |
| parent | a832b28c0df5e7d9c9ab8f0aa5e01c0e4f090787 (diff) | |
Merge branch '1.14' into 1.15
| -rw-r--r-- | paramiko/agent.py | 3 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 3 |
2 files changed, 5 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 = () diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index d26250a0..896b5111 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`` |