diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2019-10-08 11:33:25 -0400 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2019-12-02 13:45:59 -0500 |
| commit | c9c60433a2fc50088cebddabc5055524c8ebe959 (patch) | |
| tree | ae63e1f8269fd189fe60f3dbd0a1138f61ececa9 | |
| parent | 72baedd63e42e0af3ea1a26a7b151328a4dd173d (diff) | |
Fix bug around subprocess import errors
| -rw-r--r-- | paramiko/proxy.py | 4 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/paramiko/proxy.py b/paramiko/proxy.py index c04058f8..077e8e35 100644 --- a/paramiko/proxy.py +++ b/paramiko/proxy.py @@ -29,8 +29,8 @@ import time subprocess, subprocess_import_error = None, None try: import subprocess -except ImportError: - pass +except ImportError as e: + subprocess_import_error = e from paramiko.ssh_exception import ProxyCommandFailure from paramiko.util import ClosingContextManager diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 7cc39f34..91c10eeb 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,11 @@ Changelog ========= +- :bug:`- major` Paramiko's use of ``subprocess`` for ``ProxyCommand`` support + is conditionally imported to prevent issues on limited interpreter platforms + like Google Compute Engine. However, any resulting ``ImportError`` was lost + instead of preserved for raising (in the rare cases where a user tried + leveraging ``ProxyCommand`` in such an environment). This has been fixed. - :bug:`- major` Perform deduplication of ``IdentityFile`` contents during ``ssh_config`` parsing; previously, if your config would result in the same value being encountered more than once, ``IdentityFile`` would contain that |