[project @ Arch-1:robey@lag.net--2003-public%secsh--dev--1.0--patch-90]

fix __init__
fix __init__ to export BufferedFile and randpool, and to catch up with the
changes from a week or 2 ago where sftp_attr & friends were split off.
This commit is contained in:
Robey Pointer 2004-09-25 21:58:11 +00:00
parent 12269c0c9b
commit a5f6a984ee
1 changed files with 21 additions and 4 deletions

View File

@ -66,9 +66,11 @@ __version__ = "0.9-horsea"
__license__ = "GNU Lesser General Public License (LGPL)" __license__ = "GNU Lesser General Public License (LGPL)"
import transport, auth_transport, channel, rsakey, dsskey, message, ssh_exception import transport, auth_transport, channel, rsakey, dsskey, message, ssh_exception, file
import sftp, sftp_client import sftp, sftp_client, sftp_attr, sftp_file
# import sftp_server, sftp_si
randpool = transport.randpool
Transport = auth_transport.Transport Transport = auth_transport.Transport
Channel = channel.Channel Channel = channel.Channel
RSAKey = rsakey.RSAKey RSAKey = rsakey.RSAKey
@ -77,16 +79,23 @@ SSHException = ssh_exception.SSHException
Message = message.Message Message = message.Message
PasswordRequiredException = ssh_exception.PasswordRequiredException PasswordRequiredException = ssh_exception.PasswordRequiredException
SFTP = sftp_client.SFTP SFTP = sftp_client.SFTP
SFTPClient = sftp_client.SFTPClient
# SFTPServer = sftp_server.SFTPServer
SFTPError = sftp_client.SFTPError SFTPError = sftp_client.SFTPError
SFTPAttributes = sftp_client.SFTPAttributes SFTPAttributes = sftp_attr.SFTPAttributes
# SFTPServerInterface = sftp_si.SFTPServerInterface
ServerInterface = server.ServerInterface ServerInterface = server.ServerInterface
SubsystemHandler = server.SubsystemHandler
SecurityOptions = transport.SecurityOptions SecurityOptions = transport.SecurityOptions
SubsystemHandler = transport.SubsystemHandler BufferedFile = file.BufferedFile
from common import AUTH_SUCCESSFUL, AUTH_PARTIALLY_SUCCESSFUL, AUTH_FAILED, \ from common import AUTH_SUCCESSFUL, AUTH_PARTIALLY_SUCCESSFUL, AUTH_FAILED, \
OPEN_SUCCEEDED, OPEN_FAILED_ADMINISTRATIVELY_PROHIBITED, OPEN_FAILED_CONNECT_FAILED, \ OPEN_SUCCEEDED, OPEN_FAILED_ADMINISTRATIVELY_PROHIBITED, OPEN_FAILED_CONNECT_FAILED, \
OPEN_FAILED_UNKNOWN_CHANNEL_TYPE, OPEN_FAILED_RESOURCE_SHORTAGE OPEN_FAILED_UNKNOWN_CHANNEL_TYPE, OPEN_FAILED_RESOURCE_SHORTAGE
from sftp import FX_OK, FX_EOF, FX_NO_SUCH_FILE, FX_PERMISSION_DENIED, FX_FAILURE, \
FX_BAD_MESSAGE, FX_NO_CONNECTION, FX_CONNECTION_LOST, FX_OP_UNSUPPORTED
__all__ = [ 'Transport', __all__ = [ 'Transport',
'SecurityOptions', 'SecurityOptions',
'SubsystemHandler', 'SubsystemHandler',
@ -98,9 +107,12 @@ __all__ = [ 'Transport',
'PasswordRequiredException', 'PasswordRequiredException',
'SFTP', 'SFTP',
'SFTPClient', 'SFTPClient',
# 'SFTPServer',
'SFTPError', 'SFTPError',
'SFTPAttributes', 'SFTPAttributes',
# 'SFTPServerInterface',
'ServerInterface', 'ServerInterface',
'BufferedFile',
'transport', 'transport',
'auth_transport', 'auth_transport',
'channel', 'channel',
@ -110,5 +122,10 @@ __all__ = [ 'Transport',
'message', 'message',
'ssh_exception', 'ssh_exception',
'sftp_client', 'sftp_client',
# 'sftp_server',
'sftp_attr',
'sftp_file',
# 'sftp_si',
'server', 'server',
'file',
'util' ] 'util' ]