diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-04-15 02:27:11 +0000 |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-04-15 02:27:11 +0000 |
| commit | 2bde55ad3c25edcb6265893a8c8eee203a6a179b (patch) | |
| tree | eda96042f11fa5437a35fbb167cb4ff90d1f8a03 /Doc/library/os.rst | |
| parent | e1a3b9029ccb28cd9adf04b7b89ca6167dc09fdb (diff) | |
| parent | 4a529361db83f3753b4385b97dc2d12c333607f0 (diff) | |
| download | cpython-2bde55ad3c25edcb6265893a8c8eee203a6a179b.tar.gz | |
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 289276a9a5..051db9960a 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 |