diff options
author | Jeremy T. Bouse <jbouse@debian.org> | 2015-03-12 21:35:59 -0400 |
---|---|---|
committer | Jeremy T. Bouse <jbouse@debian.org> | 2015-03-12 21:35:59 -0400 |
commit | 01653e8710c38f3066078b2773ad47ccb3670c58 (patch) | |
tree | 8284e75857a06945167186d09dd9021fd24c2ee1 /paramiko/sftp_client.py | |
parent | 74794f84c2d9906aea5024dfccd90482fff9bab3 (diff) | |
parent | f784a533d6e1d09e89dc254f3493b491e19c94f0 (diff) | |
download | python-paramiko-01653e8710c38f3066078b2773ad47ccb3670c58.tar python-paramiko-01653e8710c38f3066078b2773ad47ccb3670c58.tar.gz |
Merge tag 'upstream/1.15.2'
Upstream version 1.15.2
Diffstat (limited to 'paramiko/sftp_client.py')
-rw-r--r-- | paramiko/sftp_client.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/paramiko/sftp_client.py b/paramiko/sftp_client.py index 62127cc..89840ea 100644 --- a/paramiko/sftp_client.py +++ b/paramiko/sftp_client.py @@ -65,7 +65,7 @@ class SFTPClient(BaseSFTP, ClosingContextManager): Used to open an SFTP session across an open SSH `.Transport` and perform remote file operations. - + Instances of this class may be used as context managers. """ def __init__(self, sock): @@ -101,6 +101,7 @@ class SFTPClient(BaseSFTP, ClosingContextManager): raise SSHException('EOF during negotiation') self._log(INFO, 'Opened sftp connection (server version %d)' % server_version) + @classmethod def from_transport(cls, t, window_size=None, max_packet_size=None): """ Create an SFTP client channel from an open `.Transport`. @@ -129,7 +130,6 @@ class SFTPClient(BaseSFTP, ClosingContextManager): return None chan.invoke_subsystem('sftp') return cls(chan) - from_transport = classmethod(from_transport) def _log(self, level, msg, *args): if isinstance(msg, list): |