Rev 4269: NEWS entry and final cleanup before submission. in file:///home/vila/src/bzr/bugs/355454-unicode-warning/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 4269
revision-id: v.ladeuil+lp at free.fr-20090417160845-2ti82rp1nc7kfoj4
parent: v.ladeuil+lp at free.fr-20090417145933-th1e56320bmnriao
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 355454-unicode-warning
timestamp: Fri 2009-04-17 18:08:45 +0200
message:
  NEWS entry and final cleanup before submission.
-------------- next part --------------
=== modified file 'BRANCH.TODO'
--- a/BRANCH.TODO	2009-04-17 12:52:36 +0000
+++ b/BRANCH.TODO	2009-04-17 16:08:45 +0000
@@ -3,7 +3,3 @@
 # 
 #
 
-- finish parametrizing bzrlib/tests/test__dirstate_helpers.py
-
-- clean up spurious changes
-

=== modified file 'NEWS'
--- a/NEWS	2009-04-17 07:38:44 +0000
+++ b/NEWS	2009-04-17 16:08:45 +0000
@@ -44,6 +44,9 @@
 * Non-recursive ``bzr ls`` now works properly when a path is specified.
   (Jelmer Vernooij, #357863)
 
+* Several bugs related to unicode symlinks have been fixed and the test suite
+  enhanced to better catch regressions for them. (Vincent Ladeuil)
+
 Documentation
 *************
 

=== modified file 'bzrlib/tests/branch_implementations/test_sprout.py'
--- a/bzrlib/tests/branch_implementations/test_sprout.py	2009-04-16 14:13:57 +0000
+++ b/bzrlib/tests/branch_implementations/test_sprout.py	2009-04-17 16:08:45 +0000
@@ -147,17 +147,7 @@
 
         revision = tree.commit('added a link to a Unicode target')
         tree.bzrdir.sprout('dest')
-
-        def read_link(link):
-            # The only reliable way to get the link target for python2.[456]
-            # other aternative implementations either fails to reliably return
-            # 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(target, read_link('dest/' + link_name))
+        self.assertEqual(target, osutils.readlink('dest/' + link_name))
         tree.lock_read()
         self.addCleanup(tree.unlock)
         # Check that the symlink target is safely round-tripped in the trees.

=== modified file 'bzrlib/tests/test__dirstate_helpers.py'
--- a/bzrlib/tests/test__dirstate_helpers.py	2009-04-17 12:42:50 +0000
+++ b/bzrlib/tests/test__dirstate_helpers.py	2009-04-17 16:08:45 +0000
@@ -48,7 +48,7 @@
 
 
 def load_tests(basic_tests, module, loader):
-    # FIXME: we should also parametrize agsinst Sha1Providers !
+    # FIXME: we should also parametrize against SHA1Provider !
     suite = loader.suiteClass()
     remaining_tests = basic_tests