summaryrefslogtreecommitdiffstats
path: root/Lib/macpath.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-05-19 08:00:07 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-05-19 08:00:07 (GMT)
commit5bfc03f430ab13ed84c2c30f2c87e9800b5670a4 (patch)
tree65bd9f3891193717f61424862ad75b423281d066 /Lib/macpath.py
parent6baa0a53b05d580d21d260c5d7d6ee2d3ff005ee (diff)
downloadcpython-5bfc03f430ab13ed84c2c30f2c87e9800b5670a4.zip
cpython-5bfc03f430ab13ed84c2c30f2c87e9800b5670a4.tar.gz
cpython-5bfc03f430ab13ed84c2c30f2c87e9800b5670a4.tar.bz2
Issue #23780: Improved error message in os.path.join() with single argument.
Idea by R. David Murray.
Diffstat (limited to 'Lib/macpath.py')
-rw-r--r--Lib/macpath.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/macpath.py b/Lib/macpath.py
index dbcf368..a90d105 100644
--- a/Lib/macpath.py
+++ b/Lib/macpath.py
@@ -53,6 +53,8 @@ def join(s, *p):
try:
colon = _get_colon(s)
path = s
+ if not p:
+ path[:0] + colon #23780: Ensure compatible data type even if p is null.
for t in p:
if (not path) or isabs(t):
path = t