[Python-checkins] cpython (2.7): Issue #9850: Fixed macpath.join() for empty first component. Patch by

Sat Sep 27 17:58:39 CEST 2014

https://hg.python.org/cpython/rev/2ae2ca9d2b66
changeset: 92595:2ae2ca9d2b66
branch: 2.7
parent: 92588:adac8ba7b1b1
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sat Sep 27 18:53:01 2014 +0300
summary:
 Issue #9850: Fixed macpath.join() for empty first component. Patch by
Oleg Oshmyan.
files:
 Lib/macpath.py | 2 +-
 Lib/test/test_macpath.py | 20 ++++++++++++++++++++
 Misc/NEWS | 3 +++
 3 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/Lib/macpath.py b/Lib/macpath.py
--- a/Lib/macpath.py
+++ b/Lib/macpath.py
@@ -42,7 +42,7 @@
 def join(s, *p):
 path = s
 for t in p:
- if (not s) or isabs(t):
+ if (not path) or isabs(t):
 path = t
 continue
 if t[:1] == ':':
diff --git a/Lib/test/test_macpath.py b/Lib/test/test_macpath.py
--- a/Lib/test/test_macpath.py
+++ b/Lib/test/test_macpath.py
@@ -29,6 +29,26 @@
 self.assertEqual(split(":conky:mountpoint:"),
 (':conky:mountpoint', ''))
 
+ def test_join(self):
+ join = macpath.join
+ self.assertEqual(join('a', 'b'), ':a:b')
+ self.assertEqual(join(':a', 'b'), ':a:b')
+ self.assertEqual(join(':a:', 'b'), ':a:b')
+ self.assertEqual(join(':a::', 'b'), ':a::b')
+ self.assertEqual(join(':a', '::b'), ':a::b')
+ self.assertEqual(join('a', ':'), ':a:')
+ self.assertEqual(join('a:', ':'), 'a:')
+ self.assertEqual(join('a', ''), ':a:')
+ self.assertEqual(join('a:', ''), 'a:')
+ self.assertEqual(join('', ''), '')
+ self.assertEqual(join('', 'a:b'), 'a:b')
+ self.assertEqual(join('', 'a', 'b'), ':a:b')
+ self.assertEqual(join('a:b', 'c'), 'a:b:c')
+ self.assertEqual(join('a:b', ':c'), 'a:b:c')
+ self.assertEqual(join('a', ':b', ':c'), ':a:b:c')
+ self.assertEqual(join('a', 'b:'), 'b:')
+ self.assertEqual(join('a:', 'b:'), 'b:')
+
 def test_splitext(self):
 splitext = macpath.splitext
 self.assertEqual(splitext(":foo.ext"), (':foo', '.ext'))
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,9 @@
 Library
 -------
 
+- Issue #9850: Fixed macpath.join() for empty first component. Patch by
+ Oleg Oshmyan.
+
 - Issue #20912: Now directories added to ZIP file have correct Unix and MS-DOS
 directory attributes.
 
-- 
Repository URL: https://hg.python.org/cpython
