← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/win32utils.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/win32utils.py
183
183
 
184
184
def _get_sh_special_folder_path(csidl):
185
185
    """Call SHGetSpecialFolderPathW if available, or return None.
186
 
    
 
186
 
187
187
    Result is always unicode (or None).
188
188
    """
189
189
    if has_ctypes:
401
401
        return u'./' + path, True
402
402
    else:
403
403
        return path, False
404
 
    
 
404
 
405
405
def _undo_ensure_with_dir(path, corrected):
406
406
    if corrected:
407
407
        return path[2:]
426
426
    import glob
427
427
    expanded_file_list = []
428
428
    for possible_glob in file_list:
429
 
        
 
429
 
430
430
        # work around bugs in glob.glob()
431
431
        # - Python bug #1001604 ("glob doesn't return unicode with ...")
432
432
        # - failing expansion for */* with non-iso-8859-* chars
441
441
        else:
442
442
            glob_files = [_undo_ensure_with_dir(elem, corrected) for elem in glob_files]
443
443
            expanded_file_list += glob_files
444
 
            
445
 
    return [elem.replace(u'\\', u'/') for elem in expanded_file_list] 
 
444
 
 
445
    return [elem.replace(u'\\', u'/') for elem in expanded_file_list]
446
446
 
447
447
 
448
448
def get_app_path(appname):