Issue3187 for Macintosh platform:
macpath.py now accepts both unicode string and bytes as file names.
Also add more tests for these functions.
Reviewed by Benjamin.
diff --git a/Lib/macpath.py b/Lib/macpath.py
index 7d6ae41..c023646 100644
--- a/Lib/macpath.py
+++ b/Lib/macpath.py
@@ -13,6 +13,7 @@
"devnull","realpath","supports_unicode_filenames"]
# strings representing various path-related bits and pieces
+# These are primarily for export; internally, they are hardcoded.
curdir = ':'
pardir = '::'
extsep = '.'
@@ -22,6 +23,12 @@
altsep = None
devnull = 'Dev:Null'
+def _get_colon(path):
+ if isinstance(path, bytes):
+ return b':'
+ else:
+ return ':'
+
# Normalize the case of a pathname. Dummy in Posix, but <s>.lower() here.
def normcase(path):
@@ -35,21 +42,23 @@
Anything else is absolute (the string up to the first colon is the
volume name)."""
- return ':' in s and s[0] != ':'
+ colon = _get_colon(s)
+ return colon in s and s[:1] != colon
def join(s, *p):
+ colon = _get_colon(s)
path = s
for t in p:
if (not s) or isabs(t):
path = t
continue
- if t[:1] == ':':
+ if t[:1] == colon:
t = t[1:]
- if ':' not in path:
- path = ':' + path
- if path[-1:] != ':':
- path = path + ':'
+ if colon not in path:
+ path = colon + path
+ if path[-1:] != colon:
+ path = path + colon
path = path + t
return path
@@ -59,18 +68,22 @@
bit, and the basename (the filename, without colons, in that directory).
The result (s, t) is such that join(s, t) yields the original argument."""
- if ':' not in s: return '', s
- colon = 0
+ colon = _get_colon(s)
+ if colon not in s: return s[:0], s
+ col = 0
for i in range(len(s)):
- if s[i] == ':': colon = i + 1
- path, file = s[:colon-1], s[colon:]
- if path and not ':' in path:
- path = path + ':'
+ if s[i:i+1] == colon: col = i + 1
+ path, file = s[:col-1], s[col:]
+ if path and not colon in path:
+ path = path + colon
return path, file
def splitext(p):
- return genericpath._splitext(p, sep, altsep, extsep)
+ if isinstance(p, bytes):
+ return genericpath._splitext(p, b':', altsep, b'.')
+ else:
+ return genericpath._splitext(p, sep, altsep, extsep)
splitext.__doc__ = genericpath._splitext.__doc__
def splitdrive(p):
@@ -80,7 +93,7 @@
syntactic and semantic oddities as DOS drive letters, such as there
being a separate current directory per drive)."""
- return '', p
+ return p[:0], p
# Short interfaces to split()
@@ -92,7 +105,7 @@
if not isabs(s):
return False
components = split(s)
- return len(components) == 2 and components[1] == ''
+ return len(components) == 2 and not components[1]
def islink(s):
"""Return true if the pathname refers to a symbolic link."""
@@ -131,13 +144,15 @@
"""Normalize a pathname. Will return the same result for
equivalent paths."""
- if ":" not in s:
- return ":"+s
+ colon = _get_colon(s)
- comps = s.split(":")
+ if colon not in s:
+ return colon + s
+
+ comps = s.split(colon)
i = 1
while i < len(comps)-1:
- if comps[i] == "" and comps[i-1] != "":
+ if not comps[i] and comps[i-1]:
if i > 1:
del comps[i-1:i+1]
i = i - 1
@@ -147,10 +162,10 @@
else:
i = i + 1
- s = ":".join(comps)
+ s = colon.join(comps)
# remove trailing ":" except for ":" and "Volume:"
- if s[-1] == ":" and len(comps) > 2 and s != ":"*len(s):
+ if s[-1:] == colon and len(comps) > 2 and s != colon*len(s):
s = s[:-1]
return s
@@ -169,8 +184,9 @@
return path
if not path:
return path
- components = path.split(':')
- path = components[0] + ':'
+ colon = _get_colon(path)
+ components = path.split(colon)
+ path = components[0] + colon
for c in components[1:]:
path = join(path, c)
path = Carbon.File.FSResolveAliasFile(path, 1)[0].as_pathname()