Rev 4699: (jam) Skip warning on win32 when _readdir_pyx is not found. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4699 [merge]
revision-id: pqm at pqm.ubuntu.com-20090917135110-f7vy8a1pc6sap670
parent: pqm at pqm.ubuntu.com-20090917103329-khwup105uhik6zje
parent: john at arbash-meinel.com-20090916115914-37h5y0tgfp2o4tyl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-09-17 14:51:10 +0100
message:
  (jam) Skip warning on win32 when _readdir_pyx is not found.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
=== modified file 'NEWS'
--- a/NEWS	2009-09-17 09:53:37 +0000
+++ b/NEWS	2009-09-17 13:51:10 +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'
--- a/bzrlib/osutils.py	2009-09-11 06:39:56 +0000
+++ b/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
                 )