Rev 3517: Clean up according to review comments. in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/win32_find_files

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/win32_find_files

------------------------------------------------------------
revno: 3517
revision-id: john at arbash-meinel.com-20080717122119-alnqlevrp4n3td2b
parent: john at arbash-meinel.com-20080717044957-xokssio0q76zy0q3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_find_files
timestamp: Thu 2008-07-17 07:21:19 -0500
message:
  Clean up according to review comments.
-------------- next part --------------
=== modified file 'bzrlib/_walkdirs_win32.pyx'
--- a/bzrlib/_walkdirs_win32.pyx	2008-07-17 04:49:57 +0000
+++ b/bzrlib/_walkdirs_win32.pyx	2008-07-17 12:21:19 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2008 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py	2008-07-17 04:49:57 +0000
+++ b/bzrlib/osutils.py	2008-07-17 12:21:19 +0000
@@ -1191,14 +1191,14 @@
         pass to os functions to affect the file in question. (such as os.lstat)
     """
     fs_encoding = _fs_enc.upper()
-    if (sys.platform == 'win32'):
+    if sys.platform == 'win32':
         try:
             from bzrlib._walkdirs_win32 import _walkdirs_utf8_win32_find_file
         except ImportError:
             return _walkdirs_unicode_to_utf8(top, prefix=prefix)
         else:
             return _walkdirs_utf8_win32_find_file(top, prefix=prefix)
-    if (fs_encoding not in ('UTF-8', 'US-ASCII', 'ANSI_X3.4-1968')): # ascii
+    if fs_encoding not in ('UTF-8', 'US-ASCII', 'ANSI_X3.4-1968'): # ascii
         return _walkdirs_unicode_to_utf8(top, prefix=prefix)
     else:
         return _walkdirs_fs_utf8(top, prefix=prefix)
@@ -1278,15 +1278,6 @@
         pending.extend(d for d in reversed(dirblock) if d[2] == _directory)
 
 
-def _walkdirs_utf8_win32_find_file(top, prefix=""):
-    """
-    Because Win32 has a Unicode api, all of the 'path-from-top' entries will be
-    Unicode paths.
-    """
-    from bzrlib._walkdirs_win32 import Win32Finder
-    return Win32Finder(top, prefix=prefix)
-
-
 def copy_tree(from_path, to_path, handlers={}):
     """Copy all of the entries in from_path into to_path.
 

=== modified file 'bzrlib/tests/test_osutils.py'
--- a/bzrlib/tests/test_osutils.py	2008-07-17 04:49:57 +0000
+++ b/bzrlib/tests/test_osutils.py	2008-07-17 12:21:19 +0000
@@ -981,6 +981,7 @@
     def test__walkdirs_utf_win32_find_file(self):
         self.requireFeature(WalkdirsWin32Feature)
         self.requireFeature(tests.UnicodeFilenameFeature)
+        from bzrlib._walkdirs_win32 import _walkdirs_utf8_win32_find_file
         name0u = u'0file-\xb6'
         name1u = u'1dir-\u062c\u0648'
         name2u = u'2file-\u0633'
@@ -1017,7 +1018,7 @@
                  ]
                 ),
             ]
-        result = list(osutils._walkdirs_utf8_win32_find_file(u'.'))
+        result = list(_walkdirs_utf8_win32_find_file(u'.'))
         self._filter_out_stat(result)
         self.assertEqual(expected_dirblocks, result)
 
@@ -1035,6 +1036,7 @@
         """make sure our Stat values are valid"""
         self.requireFeature(WalkdirsWin32Feature)
         self.requireFeature(tests.UnicodeFilenameFeature)
+        from bzrlib._walkdirs_win32 import _walkdirs_utf8_win32_find_file
         name0u = u'0file-\xb6'
         name0 = name0u.encode('utf8')
         self.build_tree([name0u])
@@ -1047,7 +1049,7 @@
         finally:
             f.close()
 
-        result = list(osutils._walkdirs_utf8_win32_find_file(u'.'))
+        result = list(_walkdirs_utf8_win32_find_file(u'.'))
         entry = result[0][1][0]
         self.assertEqual((name0, name0, 'file'), entry[:3])
         self.assertEqual(u'./' + name0u, entry[4])
@@ -1058,11 +1060,12 @@
         """make sure our Stat values are valid"""
         self.requireFeature(WalkdirsWin32Feature)
         self.requireFeature(tests.UnicodeFilenameFeature)
+        from bzrlib._walkdirs_win32 import _walkdirs_utf8_win32_find_file
         name0u = u'0dir-\u062c\u0648'
         name0 = name0u.encode('utf8')
         self.build_tree([name0u + '/'])
 
-        result = list(osutils._walkdirs_utf8_win32_find_file(u'.'))
+        result = list(_walkdirs_utf8_win32_find_file(u'.'))
         entry = result[0][1][0]
         self.assertEqual((name0, name0, 'directory'), entry[:3])
         self.assertEqual(u'./' + name0u, entry[4])