summaryrefslogtreecommitdiff
path: root/paramiko/channel.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-06-05 23:15:22 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-06-05 23:15:22 -0700
commit54b387833aca45a62011afbce91018023e3e9973 (patch)
treef69c5dcbd142d625ba98974ba38b093da66cea03 /paramiko/channel.py
parente9eee9c50c88de18d1f1f9325d17d2216b1656ff (diff)
parentc47952f23b1eff1ed1820edf6b699c73035b5615 (diff)
downloadparamiko-54b387833aca45a62011afbce91018023e3e9973.tar.gz
Merge branch '2.1'
Diffstat (limited to 'paramiko/channel.py')
-rw-r--r--paramiko/channel.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/paramiko/channel.py b/paramiko/channel.py
index e1747fb8..c6016a0e 100644
--- a/paramiko/channel.py
+++ b/paramiko/channel.py
@@ -307,9 +307,9 @@ class Channel (ClosingContextManager):
:param dict environment:
a dictionary containing the name and respective values to set
- :raises SSHException:
- if any of the environment variables was rejected by the server or
- the channel was closed
+ :raises:
+ `.SSHException` -- if any of the environment variables was rejected
+ by the server or the channel was closed
"""
for name, value in environment.items():
try:
@@ -332,8 +332,9 @@ class Channel (ClosingContextManager):
:param str name: name of the environment variable
:param str value: value of the environment variable
- :raises SSHException:
- if the request was rejected or the channel was closed
+ :raises:
+ `.SSHException` -- if the request was rejected or the channel was
+ closed
"""
m = Message()
m.add_byte(cMSG_CHANNEL_REQUEST)