summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2009-05-10 08:15:24 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2009-05-10 08:15:24 (GMT)
commit43c57785d3319249c03c3fa46c9df42a8ccd3e52 (patch)
tree199d57826897ac525b4057253a82aaaefcb6ef82 /Doc
parente0a2b72e61a474dceb948be57cb2983f70ab07fb (diff)
downloadcpython-43c57785d3319249c03c3fa46c9df42a8ccd3e52.zip
cpython-43c57785d3319249c03c3fa46c9df42a8ccd3e52.tar.gz
cpython-43c57785d3319249c03c3fa46c9df42a8ccd3e52.tar.bz2
Rename utf8b error handler to surrogateescape.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/codecs.rst4
-rw-r--r--Doc/library/os.rst4
2 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
index b7bd125..e3f98ef 100644
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -322,7 +322,7 @@ and implemented by all standard Python codecs:
| ``'backslashreplace'`` | Replace with backslashed escape sequences |
| | (only for encoding). |
+-------------------------+-----------------------------------------------+
-| ``'utf8b'`` | Replace byte with surrogate U+DCxx. |
+| ``'surrogateescape'`` | Replace byte with surrogate U+DCxx. |
+-------------------------+-----------------------------------------------+
In addition, the following error handlers are specific to a single codec:
@@ -335,7 +335,7 @@ In addition, the following error handlers are specific to a single codec:
+-------------------+---------+-------------------------------------------+
.. versionadded:: 3.1
- The ``'utf8b'`` and ``'surrogatepass'`` error handlers.
+ The ``'surrogateescape'`` and ``'surrogatepass'`` error handlers.
The set of allowed values can be extended via :meth:`register_error`.
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 83f5ee9..2213740 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -64,8 +64,8 @@ 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 ``utf8b`` encoding error
- handler, which means that undecodable bytes are replaced by a
+ 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.