diff options
author | Zachary Ware <zachary.ware@gmail.com> | 2014-10-10 21:05:54 (GMT) |
---|---|---|
committer | Zachary Ware <zachary.ware@gmail.com> | 2014-10-10 21:05:54 (GMT) |
commit | fc260a9a97156cc1cfee88b5947ed99d6b37025a (patch) | |
tree | 68a4f2dc3c24c8dfd3da233075541fcea577a253 /Doc/library | |
parent | 439da843e47b4d5b4fd1742845a7c4ba1c2b8c76 (diff) | |
parent | a13dab47cb8c6184115c73c379712a71c6ef7f79 (diff) | |
download | cpython-fc260a9a97156cc1cfee88b5947ed99d6b37025a.zip cpython-fc260a9a97156cc1cfee88b5947ed99d6b37025a.tar.gz cpython-fc260a9a97156cc1cfee88b5947ed99d6b37025a.tar.bz2 |
Closes #15414: Merge with 3.4
Diffstat (limited to 'Doc/library')
-rw-r--r-- | Doc/library/os.path.rst | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst index dc03f43..92631b2 100644 --- a/Doc/library/os.path.rst +++ b/Doc/library/os.path.rst @@ -206,17 +206,22 @@ the :mod:`glob` module.) Support for detecting non-root mount points on Windows. -.. function:: join(path1[, path2[, ...]]) - - Join one or more path components intelligently. If any component is an absolute - 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``) 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:: join(path, *paths) + + Join one or more path components intelligently. The return value is the + concatenation of *path* and any members of *\*paths* with exactly one + directory separator (``os.sep``) following each non-empty part except the + last, meaning that the result will only end in a separator if the last + part is empty. If a component is an absolute path, all previous + components are thrown away and joining continues from the absolute path + component. + + On Windows, the drive letter is not reset when an absolute path component + (e.g., ``r'\foo'``) is encountered. If a component contains a drive + letter, all previous components are thrown away and the drive letter is + reset. Note that 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) |