dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[project @ robey@master-shake.local-20060119232616-edcb93583d3dc005] 

john points out i could just use None for no-value and it would be a lot simpler... good point
This commit is contained in:
Robey Pointer 2006-01-19 15:26:16 -08:00
parent 1731d51b51
commit f02a4bcded
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
paramiko/sftp_attr.py
View File

@ -51,12 +51,12 @@ class SFTPAttributes (object):
Create a new (empty) SFTPAttributes object. All fields will be empty. Create a new (empty) SFTPAttributes object. All fields will be empty.
""" """
self._flags = 0 self._flags = 0
self.st_size = -1 self.st_size = None
self.st_uid = -1 self.st_uid = None
self.st_gid = -1 self.st_gid = None
self.st_mode = 0 self.st_mode = None
self.st_atime = 0 self.st_atime = None
self.st_mtime = 0 self.st_mtime = None
self.attr = {} self.attr = {}
def from_stat(cls, obj, filename=None): def from_stat(cls, obj, filename=None):
@ -120,13 +120,13 @@ class SFTPAttributes (object):
def _pack(self, msg): def _pack(self, msg):
self._flags = 0 self._flags = 0
if self.st_size >= 0: if self.st_size is not None:
self._flags |= self.FLAG_SIZE self._flags |= self.FLAG_SIZE
if (self.st_uid >= 0) or (self.st_gid >= 0): if (self.st_uid is not None) and (self.st_gid is not None):
self._flags |= self.FLAG_UIDGID self._flags |= self.FLAG_UIDGID
if self.st_mode != 0: if self.st_mode is not None:
self._flags |= self.FLAG_PERMISSIONS self._flags |= self.FLAG_PERMISSIONS
if (self.st_atime > 0) or (self.st_mtime > 0): if (self.st_atime is not None) and (self.st_mtime is not None):
self._flags |= self.FLAG_AMTIME self._flags |= self.FLAG_AMTIME
if len(self.attr) > 0: if len(self.attr) > 0:
self._flags |= self.FLAG_EXTENDED self._flags |= self.FLAG_EXTENDED
@ -150,13 +150,13 @@ class SFTPAttributes (object):
def _debug_str(self): def _debug_str(self):
out = '[ ' out = '[ '
if self.st_size >= 0: if self.st_size is not None:
out += 'size=%d ' % self.st_size out += 'size=%d ' % self.st_size
if (self.st_uid >= 0) or (self.st_gid >= 0): if (self.st_uid is not None) and (self.st_gid is not None):
out += 'uid=%d gid=%d ' % (self.st_uid, self.st_gid) out += 'uid=%d gid=%d ' % (self.st_uid, self.st_gid)
if self.st_mode != 0: if self.st_mode is not None:
out += 'mode=' + oct(self.st_mode) + ' ' out += 'mode=' + oct(self.st_mode) + ' '
if (self.st_atime > 0) or (self.st_mtime > 0): if (self.st_atime is not None) and (self.st_mtime is not None):
out += 'atime=%d mtime=%d ' % (self.st_atime, self.st_mtime) out += 'atime=%d mtime=%d ' % (self.st_atime, self.st_mtime)
for k, v in self.attr.iteritems(): for k, v in self.attr.iteritems():
out += '"%s"=%r ' % (str(k), v) out += '"%s"=%r ' % (str(k), v)
@ -176,7 +176,7 @@ class SFTPAttributes (object):
def __str__(self): def __str__(self):
"create a unix-style long description of the file (like ls -l)" "create a unix-style long description of the file (like ls -l)"
if self.st_mode != 0: if self.st_mode is not None:
kind = stat.S_IFMT(self.st_mode) kind = stat.S_IFMT(self.st_mode)
if kind == stat.S_IFIFO: if kind == stat.S_IFIFO:
ks = 'p' ks = 'p'
@ -200,11 +200,15 @@ class SFTPAttributes (object):
else: else:
ks = '?---------' ks = '?---------'
# compute display date # compute display date
if abs(time.time() - self.st_mtime) > 15552000: if self.st_mtime is None:
# (15552000 = 6 months) # shouldn't really happen
datestr = time.strftime('%d %b %Y', time.localtime(self.st_mtime)) datestr = '(unknown date)'
else: else:
datestr = time.strftime('%d %b %H:%M', time.localtime(self.st_mtime)) if abs(time.time() - self.st_mtime) > 15552000:
# (15552000 = 6 months)
datestr = time.strftime('%d %b %Y', time.localtime(self.st_mtime))
else:
datestr = time.strftime('%d %b %H:%M', time.localtime(self.st_mtime))
filename = getattr(self, 'filename', '?') filename = getattr(self, 'filename', '?')
return '%s 1 %-8d %-8d %8d %-12s %s' % (ks, self.st_uid, self.st_gid, return '%s 1 %-8d %-8d %8d %-12s %s' % (ks, self.st_uid, self.st_gid,
self.st_size, datestr, filename) self.st_size, datestr, filename)