diff options
author | Benjamin Peterson <benjamin@python.org> | 2014-03-20 17:40:03 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2014-03-20 17:40:03 (GMT) |
commit | 8efe3df6642a1d29c6e8bafe18c038ed64b398c3 (patch) | |
tree | 6dd1df4f4aeea03bcd1149214f13194f3b816784 /Doc/library | |
parent | 9636e98b18b9b1e2868a556d8a123c6888f5fe08 (diff) | |
parent | 409a1be6cfe0acb79a6742c51c1d27efe5b6386b (diff) | |
download | cpython-8efe3df6642a1d29c6e8bafe18c038ed64b398c3.zip cpython-8efe3df6642a1d29c6e8bafe18c038ed64b398c3.tar.gz cpython-8efe3df6642a1d29c6e8bafe18c038ed64b398c3.tar.bz2 |
merge 3.4
Diffstat (limited to 'Doc/library')
-rw-r--r-- | Doc/library/os.path.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst index 3771ab0..6b3a3b6 100644 --- a/Doc/library/os.path.rst +++ b/Doc/library/os.path.rst @@ -242,7 +242,7 @@ the :mod:`glob` module.) links encountered in the path (if they are supported by the operating system). -.. function:: relpath(path, start=None) +.. function:: relpath(path, start=os.curdir) Return a relative filepath to *path* either from the current directory or from an optional *start* directory. This is a path computation: the |