diff options
author | Christopher Baines <mail@cbaines.net> | 2016-02-07 21:19:28 +0000 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2016-02-07 21:19:28 +0000 |
commit | 8a563e44d42731143f4356edcad0d7469a56ea24 (patch) | |
tree | 4641e9608e76b130ea6afe467a30202494ef0eeb /paramiko/sftp_attr.py | |
parent | bbf74c0dbf66c463bd68bd30abcd338796152354 (diff) | |
parent | 31b2fd0709f259961253b9cdc875ce7827abaa68 (diff) | |
download | python-paramiko-8a563e44d42731143f4356edcad0d7469a56ea24.tar python-paramiko-8a563e44d42731143f4356edcad0d7469a56ea24.tar.gz |
Merge tag 'upstream/1.16.0'
Upstream version 1.16.0
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 cf48f65..0eaca30 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)) |