Issue #9850: Fixed macpath.join() for empty first component. Patch by
Oleg Oshmyan.
diff --git a/Lib/macpath.py b/Lib/macpath.py
index cd4cb85..c31bdaa 100644
--- 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
index 2c86c53..96ad61f 100644
--- 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
index 02e9c4c..2ad73fd 100644
--- 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.