← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: Martin Packman
  • Date: 2011-12-13 17:10:47 UTC
  • mto: This revision was merged to the branch mainline in revision 6367.
  • Revision ID: martin.packman@canonical.com-20111213171047-esvi1kyfbuehmhrm
Minor tweaks including normalising _fs_enc value

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
1770
1770
    """
1771
1771
    global _selected_dir_reader
1772
1772
    if _selected_dir_reader is None:
1773
 
        fs_encoding = _fs_enc.upper()
1774
1773
        if sys.platform == "win32" and win32utils.winver == 'Windows NT':
1775
1774
            # Win98 doesn't have unicode apis like FindFirstFileW
1776
1775
            # TODO: We possibly could support Win98 by falling back to the
1782
1781
                _selected_dir_reader = Win32ReadDir()
1783
1782
            except ImportError:
1784
1783
                pass
1785
 
        elif fs_encoding in ('UTF-8', 'US-ASCII', 'ANSI_X3.4-1968'):
1786
 
            # ANSI_X3.4-1968 is a form of ASCII
 
1784
        elif _fs_enc in ('utf-8', 'ascii'):
1787
1785
            try:
1788
1786
                from bzrlib._readdir_pyx import UTF8DirReader
1789
1787
                _selected_dir_reader = UTF8DirReader()