diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-04-15 02:27:11 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-04-15 02:27:11 (GMT) |
| commit | cda80940ed444d01beed797dcd86c207f11104bc (patch) | |
| tree | 7beaa1c4db9c2e8351a9cf8ddda6a656900d4275 /Doc/library/os.rst | |
| parent | 8ca020e1cc2590472ba83611727ae20d9f34bfe5 (diff) | |
| parent | 20d325574eaa4f2a88036eac81e8d3cf9135372f (diff) | |
| download | cpython-cda80940ed444d01beed797dcd86c207f11104bc.zip cpython-cda80940ed444d01beed797dcd86c207f11104bc.tar.gz cpython-cda80940ed444d01beed797dcd86c207f11104bc.tar.bz2 | |
Issue #15984: Merge PyUnicode doc from 3.5
Diffstat (limited to 'Doc/library/os.rst')
| -rw-r--r-- | Doc/library/os.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 289276a..051db99 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -1762,7 +1762,7 @@ features: ``os.path.join(os.path.dirname(path), result)``. If the *path* is a string object, the result will also be a string object, - and the call may raise an UnicodeDecodeError. If the *path* is a bytes + and the call may raise a UnicodeDecodeError. If the *path* is a bytes object, the result will be a bytes object. This function can also support :ref:`paths relative to directory descriptors |