Merge lp:~jameinel/bzr/2.1.0b1-no_win_warning into lp:bzr

[John A Meinel]

[John A Meinel (jameinel)]

fixes the permanent warning on Windows (because _readdir_pyx is never built there)

We'll still get a warning about _readdir_pyx when it is important (when trying to actually walk the filesystem.)

[Martin Pool (mbp)]

> fixes the permanent warning on Windows (because _readdir_pyx is never built
> there)
>
> We'll still get a warning about _readdir_pyx when it is important (when trying
> to actually walk the filesystem.)

Generally speaking if we expect it to be missing on some platforms we should have a check on flagging the absence, or perhaps for slight speed we should check the platform before even trying to import. But if that's unnecessary here, ok.

review: Approve

=== modified file 'NEWS'
--- NEWS	2009-09-16 07:47:47 +0000
+++ NEWS	2009-09-16 11:59:14 +0000
@@ -52,6 +52,9 @@
   the partial packs created during the conversion not being consolidated
   at the end of the conversion process. (Robert Collins, #423818)
 
+* Don't give a warning on Windows when failing to import ``_readdir_pyx``
+  as it is never built. (John Arbash Meinel, #430645)
+
 * Don't restrict the command name used to run the test suite.
   (Vincent Ladeuil, #419950)
 

=== modified file 'bzrlib/osutils.py'
--- bzrlib/osutils.py	2009-09-11 06:39:56 +0000
+++ bzrlib/osutils.py	2009-09-16 11:59:14 +0000
@@ -1828,7 +1828,8 @@
             from bzrlib._readdir_pyx import UTF8DirReader
             file_kind_from_stat_mode = UTF8DirReader().kind_from_mode
         except ImportError, e:
-            failed_to_load_extension(e)
+            # This is one time where we won't warn that an extension failed to
+            # load. The extension is never available on Windows anyway.
             from bzrlib._readdir_py import (
                 _kind_from_mode as file_kind_from_stat_mode
                 )