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 | |
| parent | d4f95959ef8f4dff421e968f108ba79558256de8 (diff) | |
| parent | f95efb8a2b8d3880b8348064c178c67930537efe (diff) | |
Merge branch '2.4' into 2.5
| -rw-r--r-- | paramiko/__init__.py | 2 | ||||
| -rw-r--r-- | tests/test_channelfile.py | 4 |
2 files changed, 3 insertions, 3 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, diff --git a/tests/test_channelfile.py b/tests/test_channelfile.py index f8cfe473..6faf8bf8 100644 --- a/tests/test_channelfile.py +++ b/tests/test_channelfile.py @@ -1,6 +1,6 @@ from mock import patch, MagicMock -from paramiko import Channel, ChannelFile +from paramiko import Channel, ChannelFile, ChannelStderrFile class TestChannelFile(object): @@ -27,7 +27,7 @@ class TestChannelFile(object): chan.sendall.assert_called_once_with(b"ohai") -def TestChannelStderrFile(object): +class TestChannelStderrFile(object): def test_read_calls_channel_recv_stderr(self): chan = MagicMock() cf = ChannelStderrFile(chan) |