Rev 3725: bring in some win32 fixes for readdir code. in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 3725
revision-id: john at arbash-meinel.com-20080922220133-p1kqv51p4gtncbh3
parent: john at arbash-meinel.com-20080922214731-3t5644s6o6o4ibav
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2008-09-22 17:01:33 -0500
message:
  bring in some win32 fixes for readdir code.
-------------- next part --------------
=== modified file 'bzrlib/_walkdirs_win32.pyx'
--- a/bzrlib/_walkdirs_win32.pyx	2008-09-09 16:13:37 +0000
+++ b/bzrlib/_walkdirs_win32.pyx	2008-09-22 22:01:33 +0000
@@ -71,7 +71,7 @@
 import operator
 import stat
 
-from bzrlib import osutils
+from bzrlib import osutils, _readdir_py
 
 
 cdef class _Win32Stat:
@@ -158,8 +158,8 @@
     cdef object _file_kind
 
     def __init__(self):
-        self._directory_kind = osutils._directory_kind
-        self._file_kind = osutils._formats[stat.S_IFREG]
+        self._directory_kind = _readdir_py._directory
+        self._file_kind = _readdir_py._file
 
     def top_prefix_to_starting_dir(self, top, prefix=""):
         """See DirReader.top_prefix_to_starting_dir."""

=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py	2008-09-22 21:47:31 +0000
+++ b/bzrlib/osutils.py	2008-09-22 22:01:33 +0000
@@ -1565,8 +1565,9 @@
             file_kind_from_stat_mode = UTF8DirReader().kind_from_mode
         except ImportError:
             from bzrlib._readdir_py import (
-                _kind_from_mode as _file_kind_from_stat_mode
+                _kind_from_mode
                 )
+            file_kind_from_stat_mode = _kind_from_mode
     return file_kind_from_stat_mode(mode)
 file_kind_from_stat_mode = file_kind_from_stat_mode_thunk