diff options
| author | Georg Brandl <georg@python.org> | 2010-10-06 08:43:56 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-10-06 08:43:56 (GMT) |
| commit | 23b4f927d5e1c55ee0ff26570dfcaf3f307254fe (patch) | |
| tree | 4d545a0aeb81b8fee1c18df4ab9f148b75248012 /Doc/library/os.rst | |
| parent | 13f959b50185bc664497d95f3d370aa9aad34365 (diff) | |
| download | cpython-23b4f927d5e1c55ee0ff26570dfcaf3f307254fe.zip cpython-23b4f927d5e1c55ee0ff26570dfcaf3f307254fe.tar.gz cpython-23b4f927d5e1c55ee0ff26570dfcaf3f307254fe.tar.bz2 | |
Merged revisions 84142 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r84142 | georg.brandl | 2010-08-17 17:07:14 +0200 (Di, 17 Aug 2010) | 1 line
Consistency check for versionadded/changed directives.
........
Diffstat (limited to 'Doc/library/os.rst')
| -rw-r--r-- | Doc/library/os.rst | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 9635d8a..9680d7a 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -67,23 +67,22 @@ Notes on the availability of these functions: File Names, Command Line Arguments, and Environment Variables ------------------------------------------------------------- -In Python, file names, command line arguments, and environment -variables are represented using the string type. On some systems, -decoding these strings to and from bytes is necessary before passing -them to the operating system. Python uses the file system encoding to -perform this conversion (see :func:`sys.getfilesystemencoding`). +In Python, file names, command line arguments, and environment variables are +represented using the string type. On some systems, decoding these strings to +and from bytes is necessary before passing them to the operating system. Python +uses the file system encoding to perform this conversion (see +:func:`sys.getfilesystemencoding`). .. versionchanged:: 3.1 - On some systems, conversion using the file system encoding may - fail. In this case, Python uses the ``surrogateescape`` encoding - error handler, which means that undecodable bytes are replaced by a - Unicode character U+DCxx on decoding, and these are again - translated to the original byte on encoding. + On some systems, conversion using the file system encoding may fail. In this + case, Python uses the ``surrogateescape`` encoding error handler, which means + that undecodable bytes are replaced by a Unicode character U+DCxx on + decoding, and these are again translated to the original byte on encoding. -The file system encoding must guarantee to successfully decode all -bytes below 128. If the file system encoding fails to provide this -guarantee, API functions may raise UnicodeErrors. +The file system encoding must guarantee to successfully decode all bytes +below 128. If the file system encoding fails to provide this guarantee, API +functions may raise UnicodeErrors. .. _os-procinfo: |