diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2015-11-02 13:15:15 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2015-11-02 13:15:15 -0800 |
| commit | 07ff30537a225f9b9c2c31eaf9b376d412907c37 (patch) | |
| tree | 70ad9c5bca7144d93120818b85d2b2723115b441 /paramiko/sftp_attr.py | |
| parent | 985df357ec039bcb28f6f260e64e9838204506f6 (diff) | |
| parent | a1b160c1ff4ee1576b82f98990285ccddadd9b61 (diff) | |
| download | paramiko-07ff30537a225f9b9c2c31eaf9b376d412907c37.tar.gz | |
Merge branch '1.14' into 1.15
Diffstat (limited to 'paramiko/sftp_attr.py')
| -rw-r--r-- | paramiko/sftp_attr.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/paramiko/sftp_attr.py b/paramiko/sftp_attr.py index cf48f654..0eaca30b 100644 --- a/paramiko/sftp_attr.py +++ b/paramiko/sftp_attr.py @@ -209,12 +209,15 @@ class SFTPAttributes (object): # not all servers support uid/gid uid = self.st_uid gid = self.st_gid + size = self.st_size if uid is None: uid = 0 if gid is None: gid = 0 + if size is None: + size = 0 - return '%s 1 %-8d %-8d %8d %-12s %s' % (ks, uid, gid, self.st_size, datestr, filename) + return '%s 1 %-8d %-8d %8d %-12s %s' % (ks, uid, gid, size, datestr, filename) def asbytes(self): return b(str(self)) |