diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2019-06-14 18:38:35 -0400 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2019-06-14 18:38:35 -0400 |
commit | a0debff14471efe636780a9af50d421db9963ab5 (patch) | |
tree | 3f8e35d2aea3b98d1fae75f644929c40f2d86f3a /paramiko/__init__.py | |
parent | d4f95959ef8f4dff421e968f108ba79558256de8 (diff) | |
parent | f95efb8a2b8d3880b8348064c178c67930537efe (diff) | |
download | paramiko-a0debff14471efe636780a9af50d421db9963ab5.tar.gz |
Merge branch '2.4' into 2.5
Diffstat (limited to 'paramiko/__init__.py')
-rw-r--r-- | paramiko/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/paramiko/__init__.py b/paramiko/__init__.py index ebfa72a8..6afc7a61 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -29,7 +29,7 @@ from paramiko.client import ( ) from paramiko.auth_handler import AuthHandler from paramiko.ssh_gss import GSSAuth, GSS_AUTH_AVAILABLE, GSS_EXCEPTIONS -from paramiko.channel import Channel, ChannelFile +from paramiko.channel import Channel, ChannelFile, ChannelStderrFile from paramiko.ssh_exception import ( SSHException, PasswordRequiredException, |