Rev 4264: Use better fixes for unicode symlinks handling in WTs. in file:///home/vila/src/bzr/bugs/355454-unicode-warning/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/355454-unicode-warning/

------------------------------------------------------------
revno: 4264
revision-id: v.ladeuil+lp at free.fr-20090417085831-vg404ie0lsc1kpgw
parent: v.ladeuil+lp at free.fr-20090417085444-zweb9i1no259oz6k
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 355454-unicode-warning
timestamp: Fri 2009-04-17 10:58:31 +0200
message:
  Use better fixes for unicode symlinks handling in WTs.
  
  * bzrlib/workingtree.py:
  (WorkingTree.path_content_summary,
  WorkingTree.get_symlink_target): Use osutils.readlink.
-------------- next part --------------
=== modified file 'BRANCH.TODO'
--- a/BRANCH.TODO	2009-04-17 08:54:44 +0000
+++ b/BRANCH.TODO	2009-04-17 08:58:31 +0000
@@ -3,11 +3,6 @@
 # 
 #
 
-- use osutils.readlink in: 
-
-  - bzrlib/workingtree.py WorkingTree.path_content_summary and
-    get_symlink_target
- 
 - finish parametrizing bzrlib/tests/test__dirstate_helpers.py
 
 - clean up spurious changes

=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py	2009-04-16 14:13:57 +0000
+++ b/bzrlib/workingtree.py	2009-04-17 08:58:31 +0000
@@ -749,9 +749,8 @@
                 kind = 'tree-reference'
             return kind, None, None, None
         elif kind == 'symlink':
+            target = osutils.readlink(abspath)
 #            import pronto; pronto.bzr_test('WorkingTree.path_content_summary')
-            target = os.readlink(abspath.encode(osutils._fs_enc))
-            target = target.decode(osutils._fs_enc)
             return ('symlink', None, None, target)
         else:
             return (kind, None, None, None)
@@ -975,8 +974,7 @@
 
     def get_symlink_target(self, file_id):
         abspath = self.id2abspath(file_id)
-        target = os.readlink(abspath.encode(osutils._fs_enc))
-        target = target.decode(osutils._fs_enc)
+        target = osutils.readlink(abspath)
         return target
 
     @needs_write_lock