diff options
| -rw-r--r-- | README | 1 | ||||
| -rw-r--r-- | paramiko/pkey.py | 6 | ||||
| -rw-r--r-- | paramiko/sftp_attr.py | 2 |
3 files changed, 5 insertions, 4 deletions
@@ -222,3 +222,4 @@ v0.9 FEAROW * ctr forms of ciphers are missing (blowfish-ctr, aes128-ctr, aes256-ctr) * server mode needs better documentation * add method to block until a channel's "exit-status" is set +* the error message from this is confusing as hell: DSSKey() diff --git a/paramiko/pkey.py b/paramiko/pkey.py index a872ae8e..9ea781b8 100644 --- a/paramiko/pkey.py +++ b/paramiko/pkey.py @@ -169,7 +169,7 @@ class PKey (object): @param msg: an SSH signature message @type msg: L{Message} @return: C{True} if the signature verifies correctly; C{False} - otherwise. + otherwise. @rtype: boolean """ return False @@ -186,14 +186,14 @@ class PKey (object): @param filename: name of the file to read. @type filename: str @param password: an optional password to use to decrypt the key file, - if it's encrypted + if it's encrypted @type password: str @return: a new key object based on the given private key. @rtype: L{PKey} @raise IOError: if there was an error reading the file. @raise PasswordRequiredException: if the private key file is - encrypted, and C{password} is C{None}. + encrypted, and C{password} is C{None}. @raise SSHException: if the key file is invalid. @since: fearow diff --git a/paramiko/sftp_attr.py b/paramiko/sftp_attr.py index 5051686f..f1cfaf62 100644 --- a/paramiko/sftp_attr.py +++ b/paramiko/sftp_attr.py @@ -148,7 +148,7 @@ class SFTPAttributes (object): if hasattr(self, 'st_uid') or hasattr(self, 'st_gid'): out += 'uid=%d gid=%d ' % (getattr(self, 'st_uid', 0), getattr(self, 'st_gid', 0)) if hasattr(self, 'st_mode'): - out += 'mode=%d ' % self.st_mode + out += 'mode=' + oct(self.st_mode) if hasattr(self, 'st_atime') or hasattr(self, 'st_mtime'): out += 'atime=%d mtime=%d ' % (getattr(self, 'st_atime', 0), getattr(self, 'st_mtime', 0)) |