← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: John Arbash Meinel
  • Date: 2009-09-16 11:59:14 UTC
  • mto: This revision was merged to the branch mainline in revision 4699.
  • Revision ID: john@arbash-meinel.com-20090916115914-37h5y0tgfp2o4tyl
https://launchpad.net/bugs/430645
Fix bug #430645, don't issue a warning when failing to import _readdir_pyx the second time.

We will still warn if it isn't available for walking directories,
we just ignore it when it is only being used for a fairly simple function.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
1828
1828
            from bzrlib._readdir_pyx import UTF8DirReader
1829
1829
            file_kind_from_stat_mode = UTF8DirReader().kind_from_mode
1830
1830
        except ImportError, e:
1831
 
            failed_to_load_extension(e)
 
1831
            # This is one time where we won't warn that an extension failed to
 
1832
            # load. The extension is never available on Windows anyway.
1832
1833
            from bzrlib._readdir_py import (
1833
1834
                _kind_from_mode as file_kind_from_stat_mode
1834
1835
                )