[Python-checkins] cpython (merge 3.2 -> default): merge #9921: clarify os.path.join joining algorithm

Fri Jun 24 03:27:52 CEST 2011

http://hg.python.org/cpython/rev/b6759568b812
changeset: 70939:b6759568b812
parent: 70936:54fb77e0762c
parent: 70938:f5f5b715be7e
user: R David Murray <rdmurray at bitdance.com>
date: Thu Jun 23 21:26:48 2011 -0400
summary:
 merge #9921: clarify os.path.join joining algorithm
files:
 Doc/library/os.path.rst | 9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -190,10 +190,11 @@
 path, all previous components (on Windows, including the previous drive letter,
 if there was one) are thrown away, and joining continues. The return value is
 the concatenation of *path1*, and optionally *path2*, etc., with exactly one
- directory separator (``os.sep``) inserted between components, unless *path2* is
- empty. Note that on Windows, since there is a current directory for each drive,
- ``os.path.join("c:", "foo")`` represents a path relative to the current
- directory on drive :file:`C:` (:file:`c:foo`), not :file:`c:\\foo`.
+ directory separator (``os.sep``) following each non-empty part except the last.
+ (This means that an empty last part will result in a path that ends with a
+ separator.) Note that on Windows, since there is a current directory for
+ each drive, ``os.path.join("c:", "foo")`` represents a path relative to the
+ current directory on drive :file:`C:` (:file:`c:foo`), not :file:`c:\\foo`.
 
 
 .. function:: normcase(path)
-- 
Repository URL: http://hg.python.org/cpython
