← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to lib/fileservice_lib/listing.py

  • Committer: wagrant
  • Date: 2008-07-16 01:31:54 UTC
  • Revision ID: svn-v3-trunk0:2b9c9e99-6f39-0410-b283-7f802c844ae2:trunk:885
fileservice_lib: Clean up the refactored bits.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/fileservice_lib/listing.py
246
246
    
247
247
    return listing
248
248
 
249
 
def _fullpath_stat_fileinfo(fullpath, ind):
 
249
def _fullpath_stat_fileinfo(fullpath):
250
250
    file_stat = os.stat(fullpath)
251
 
    return _stat_fileinfo(fullpath, file_stat, ind)
 
251
    return _stat_fileinfo(fullpath, file_stat)
252
252
 
253
 
def _stat_fileinfo(fullpath, file_stat, ind):
254
 
    d = ind.copy()
 
253
def _stat_fileinfo(fullpath, file_stat):
 
254
    d = {}
255
255
    if stat.S_ISDIR(file_stat.st_mode):
256
256
        d["isdir"] = True
257
257
        d["type_nice"] = util.nice_filetype("/")
275
275
    needs to display about the filename. Returns a dict containing a number
276
276
    of fields related to the file (excluding the filename itself)."""
277
277
    fullpath = path if len(filename) == 0 else os.path.join(path, filename)
278
 
    return _fullpath_stat_fileinfo(fullpath, {})
 
278
    return _fullpath_stat_fileinfo(fullpath)
279
279
 
280
280
def PysvnStatus_to_fileinfo(path, status):
281
281
    """Given a PysvnStatus object, gets all the info "ls"
295
295
        filename = "."
296
296
    else:
297
297
        filename = os.path.basename(fullpath)
298
 
    d = {}
299
298
    text_status = status.text_status
300
 
    d["svnstatus"] = str(text_status)
 
299
    d = {'svnstatus': str(text_status)}
301
300
    try:
302
 
        d = _fullpath_stat_fileinfo(fullpath, d)
 
301
        d.update(_fullpath_stat_fileinfo(fullpath))
303
302
    except OSError:
304
303
        # Here if, eg, the file is missing.
305
304
        # Can't get any more information so just return d
325
324
        filename = "."
326
325
    else:
327
326
        filename = os.path.basename(fullpath)
328
 
    d = {}
329
 
    d["svnstatus"] = "revision" # A special status
 
327
    d = {'svnstatus': 'revision'} # A special status.
330
328
 
331
329
    wrapped = common.svn.PysvnListStatWrapper(pysvnlist)
332
 
    d.update(_stat_fileinfo(fullpath, wrapped, {}))
 
330
    d.update(_stat_fileinfo(fullpath, wrapped))
333
331
 
334
332
    return filename, d
335
333