← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-06-19 02:45:33 UTC
  • mfrom: (2531.1.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20070619024533-oand7e7ns9eyis9x
Merge the 0.17 fixes back into bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
1149
1149
        path-from-top might be unicode or utf8, but it is the correct path to
1150
1150
        pass to os functions to affect the file in question. (such as os.lstat)
1151
1151
    """
1152
 
    fs_encoding = sys.getfilesystemencoding().upper()
 
1152
    fs_encoding = _fs_enc.upper()
1153
1153
    if (sys.platform == 'win32' or
1154
1154
        fs_encoding not in ('UTF-8', 'US-ASCII', 'ANSI_X3.4-1968')): # ascii
1155
1155
        return _walkdirs_unicode_to_utf8(top, prefix=prefix)