[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.

1 files changed, 21 insertions, 4 deletions

diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index 67bc6662..06916d98 100644
--- a/paramiko/__init__.py
+++ b/paramiko/__init__.py
@@ -66,9 +66,11 @@ __version__ = "0.9-horsea"
 __license__ = "GNU Lesser General Public License (LGPL)"
 
 
-import transport, auth_transport, channel, rsakey, dsskey, message, ssh_exception
-import sftp, sftp_client
+import transport, auth_transport, channel, rsakey, dsskey, message, ssh_exception, file
+import sftp, sftp_client, sftp_attr, sftp_file
+# import sftp_server, sftp_si
 
+randpool = transport.randpool
 Transport = auth_transport.Transport
 Channel = channel.Channel
 RSAKey = rsakey.RSAKey
@@ -77,16 +79,23 @@ SSHException = ssh_exception.SSHException
 Message = message.Message
 PasswordRequiredException = ssh_exception.PasswordRequiredException
 SFTP = sftp_client.SFTP
+SFTPClient = sftp_client.SFTPClient
+# SFTPServer = sftp_server.SFTPServer
 SFTPError = sftp_client.SFTPError
-SFTPAttributes = sftp_client.SFTPAttributes
+SFTPAttributes = sftp_attr.SFTPAttributes
+# SFTPServerInterface = sftp_si.SFTPServerInterface
 ServerInterface = server.ServerInterface
+SubsystemHandler = server.SubsystemHandler
 SecurityOptions = transport.SecurityOptions
-SubsystemHandler = transport.SubsystemHandler
+BufferedFile = file.BufferedFile
 
 from common import AUTH_SUCCESSFUL, AUTH_PARTIALLY_SUCCESSFUL, AUTH_FAILED, \
      OPEN_SUCCEEDED, OPEN_FAILED_ADMINISTRATIVELY_PROHIBITED,  OPEN_FAILED_CONNECT_FAILED, \
      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',
             'SecurityOptions',
             'SubsystemHandler',
@@ -98,9 +107,12 @@ __all__ = [ 'Transport',
             'PasswordRequiredException',
             'SFTP',
             'SFTPClient',
+#            'SFTPServer',
             'SFTPError',
             'SFTPAttributes',
+#            'SFTPServerInterface',
             'ServerInterface',
+            'BufferedFile',
             'transport',
             'auth_transport',
             'channel',
@@ -110,5 +122,10 @@ __all__ = [ 'Transport',
             'message',
             'ssh_exception',
             'sftp_client',
+#            'sftp_server',
+            'sftp_attr',
+            'sftp_file',
+#            'sftp_si',
             'server',
+            'file',
             'util' ]