diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-12 15:27:59 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-12 15:27:59 -0800 |
| commit | 36b5edd82c39e6580526c7c2190671330390c984 (patch) | |
| tree | e235f14f8448b2bd0a7dedd1375ac1f58682889a | |
| parent | e0692f411287a814425d6835278b1c0caa91c82e (diff) | |
| parent | 3d913a973097fdff1b5834e165ff0bef737365b5 (diff) | |
Merge branch '1.18' into 2.1
| -rw-r--r-- | paramiko/client.py | 2 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/paramiko/client.py b/paramiko/client.py index 69666360..53282c01 100644 --- a/paramiko/client.py +++ b/paramiko/client.py @@ -464,7 +464,7 @@ class SSHClient (ClosingContextManager): """ chan = self._transport.open_session() chan.get_pty(term, width, height, width_pixels, height_pixels) - chan.update_environment_variables(environment or {}) + chan.update_environment(environment or {}) chan.invoke_shell() return chan diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index ee2d3475..0da73cb8 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,10 @@ Changelog ========= +* :bug:`859` (via :issue:`860`) A tweak to the original patch implementing + :issue:`398` was not fully applied, causing calls to + `~paramiko.client.SSHClient.invoke_shell` to fail with ``AttributeError``. + This has been fixed. Patch credit: Kirk Byers. * :release:`2.1.0 <2016-12-09>` * :release:`2.0.3 <2016-12-09>` * :release:`1.18.0 <2016-12-09>` |