Rev 6594: Late bugfix in python 2.7.6, only tests are affected. in file:///home/vila/src/bzr/bugs/1303879-py27-issues/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/1303879-py27-issues/

------------------------------------------------------------
revno: 6594
revision-id: v.ladeuil+lp at free.fr-20140409080523-kb5kr12j29imskd0
parent: v.ladeuil+lp at free.fr-20140409080039-zq5y8wu59qc8bgnz
fixes bug: https://launchpad.net/bugs/1303879
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 1303879-py27-issues
timestamp: Wed 2014-04-09 10:05:23 +0200
message:
  Late bugfix in python 2.7.6, only tests are affected.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_osutils.py'
--- a/bzrlib/tests/test_osutils.py	2013-06-24 12:03:12 +0000
+++ b/bzrlib/tests/test_osutils.py	2014-04-09 08:05:23 +0000
@@ -943,9 +943,15 @@
                          osutils._win32_pathjoin('path/to', 'C:/foo'))
         self.assertEqual('path/to/foo',
                          osutils._win32_pathjoin('path/to/', 'foo'))
-        self.assertEqual('/foo',
+
+    def test_pathjoin_late_bugfix(self):
+        if sys.version_info < (2, 7, 6):
+            expected = '/foo'
+        else:
+            expected = 'C:/foo'
+        self.assertEqual(expected,
                          osutils._win32_pathjoin('C:/path/to/', '/foo'))
-        self.assertEqual('/foo',
+        self.assertEqual(expected,
                          osutils._win32_pathjoin('C:\\path\\to\\', '\\foo'))
 
     def test_normpath(self):

=== modified file 'doc/en/release-notes/bzr-2.7.txt'
--- a/doc/en/release-notes/bzr-2.7.txt	2014-04-09 08:00:39 +0000
+++ b/doc/en/release-notes/bzr-2.7.txt	2014-04-09 08:05:23 +0000
@@ -66,6 +66,9 @@
 * Handle (minor) incompatible change in python 2.7.6 leading to test
   failures. Only tests are affected. (Vincent Ladeuil, #1303879)
 
+* Take python 2.7.6 late (better than never) bugfix in ntpath.py into
+  account. Only tests are affected (Vincent Ladeuil, #1303879).
+
 * Remove wrong assumption about how TCP server and client interact when run
   inside the same process. (Vincent Ladeuil, #1269886).