Rev 4267: More cleanup. in file:///home/vila/src/bzr/bugs/355454-unicode-warning/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 4267
revision-id: v.ladeuil+lp at free.fr-20090417132515-619d0xuo60orqjpo
parent: v.ladeuil+lp at free.fr-20090417125236-1h8bkodqys6reofz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 355454-unicode-warning
timestamp: Fri 2009-04-17 15:25:15 +0200
message:
  More cleanup.
-------------- next part --------------
=== modified file 'bzrlib/bundle/bundle_data.py'
--- a/bzrlib/bundle/bundle_data.py	2009-04-16 14:13:57 +0000
+++ b/bzrlib/bundle/bundle_data.py	2009-04-17 13:25:15 +0000
@@ -458,7 +458,6 @@
 
 
 class BundleTree(Tree):
-
     def __init__(self, base_tree, revision_id):
         self.base_tree = base_tree
         self._renamed = {} # Mapping from old_path => new_path

=== modified file 'bzrlib/bundle/serializer/v08.py'
--- a/bzrlib/bundle/serializer/v08.py	2009-04-16 14:13:57 +0000
+++ b/bzrlib/bundle/serializer/v08.py	2009-04-17 13:25:15 +0000
@@ -91,7 +91,6 @@
 
 
 class BundleSerializerV08(BundleSerializer):
-
     def read(self, f):
         """Read the rest of the bundles from the supplied file.
 

=== modified file 'bzrlib/tests/test_shelf.py'
--- a/bzrlib/tests/test_shelf.py	2009-04-17 08:04:36 +0000
+++ b/bzrlib/tests/test_shelf.py	2009-04-17 13:25:15 +0000
@@ -176,20 +176,10 @@
                          list(creator.iter_shelvable()))
         creator.shelve_modify_target('foo-id')
         creator.transform()
-
-        def read_link(link):
-            # Only reliable way to get the link target for python2.[456] other
-            # laternative implementations either fails to reliably reutrn a
-            # unicode string or fails to encode the received unicode string
-            link = link.encode(osutils._fs_enc)
-            target = os.readlink(link)
-            target = target.decode(osutils._fs_enc)
-            return target
-
-        self.assertEqual(old_target, read_link(link_name))
+        self.assertEqual(old_target, osutils.readlink(link_name))
         s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
         limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
-        self.assertEqual(new_target, read_link(limbo_name))
+        self.assertEqual(new_target, osutils.readlink(limbo_name))
         ptree = creator.shelf_transform.get_preview_tree()
         self.assertEqual(new_target, ptree.get_symlink_target('foo-id'))