Rev 2338: Merge tweaks in file:///home/robertc/source/baz/pathinfo/

[Robert Collins]

At file:///home/robertc/source/baz/pathinfo/

------------------------------------------------------------
revno: 2338
revision-id: robertc at robertcollins.net-20070313042349-a4lfhw7wx8q4fw08
parent: robertc at robertcollins.net-20070313032004-x4arzbpo07l320r6
parent: robertc at robertcollins.net-20070313041535-3f307c11qo6pdr5d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: pathinfo
timestamp: Tue 2007-03-13 15:23:49 +1100
message:
  Merge tweaks
modified:
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
    ------------------------------------------------------------
    revno: 2326.1.9
    merged: robertc at robertcollins.net-20070313041535-3f307c11qo6pdr5d
    parent: robertc at robertcollins.net-20070313025234-3jhyogdj37n36heo
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate2
    timestamp: Tue 2007-03-13 15:15:35 +1100
    message:
      Minor cleanup of _walkdirs_fs_utf8.
=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py	2007-03-10 04:24:06 +0000
+++ b/bzrlib/osutils.py	2007-03-13 04:15:35 +0000
@@ -1132,10 +1132,8 @@
     This sub-function is called when we know the filesystem is already in utf8
     encoding. So we don't need to transcode filenames.
     """
-    _lstat = os.lstat
     _directory = _directory_kind
     _listdir = os.listdir
-    _kind_from_mode = _formats.get
 
     # 0 - relpath, 1- basename, 2- path_info, 3-toppath
     # But we don't actually use 1 & 2 in pending, so set them to None
@@ -1157,7 +1155,7 @@
         yield (relroot, top), dirblock
 
         # push the user specified dirs from dirblock
-        pending.extend(d for d in reversed(dirblock) if d[2][0] is _directory)
+        pending.extend(reversed([d for d in dirblock if d[2][0] is _directory]))
 
 
 def _walkdirs_unicode_to_utf8(top, prefix="", path_info=path_info.path_info):