summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2019-05-13 08:42:31 (GMT)
committerGitHub <noreply@github.com>2019-05-13 08:42:31 (GMT)
commit3aef48e3157f52a8bcdbacf47a35d0016348735e (patch)
tree635942541dfc2c32339c6256c0c534b389cfe80c /Doc/library
parentcf599f6f6f1c392d8f12936982a370d533782195 (diff)
downloadcpython-3aef48e3157f52a8bcdbacf47a35d0016348735e.zip
cpython-3aef48e3157f52a8bcdbacf47a35d0016348735e.tar.gz
cpython-3aef48e3157f52a8bcdbacf47a35d0016348735e.tar.bz2
bpo-36778: Update cp65001 codec documentation (GH-13240)
Remove cp65001 from the codecs table, list it as an alias of utf_8 and add a versionchanged markup.
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/codecs.rst9
1 files changed, 4 insertions, 5 deletions
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
index 8d3daa3..2e9314e 100644
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -1106,10 +1106,6 @@ particular, the following variants typically exist:
+-----------------+--------------------------------+--------------------------------+
| cp1258 | windows-1258 | Vietnamese |
+-----------------+--------------------------------+--------------------------------+
-| cp65001 | | Alias to ``utf_8`` encoding |
-| | | |
-| | | .. versionadded:: 3.3 |
-+-----------------+--------------------------------+--------------------------------+
| euc_jp | eucjp, ujis, u-jis | Japanese |
+-----------------+--------------------------------+--------------------------------+
| euc_jis_2004 | jisx0213, eucjis2004 | Japanese |
@@ -1234,7 +1230,7 @@ particular, the following variants typically exist:
+-----------------+--------------------------------+--------------------------------+
| utf_7 | U7, unicode-1-1-utf-7 | all languages |
+-----------------+--------------------------------+--------------------------------+
-| utf_8 | U8, UTF, utf8 | all languages |
+| utf_8 | U8, UTF, utf8, cp65001 | all languages |
+-----------------+--------------------------------+--------------------------------+
| utf_8_sig | | all languages |
+-----------------+--------------------------------+--------------------------------+
@@ -1245,6 +1241,9 @@ particular, the following variants typically exist:
The utf-32\* decoders no longer decode
byte sequences that correspond to surrogate code points.
+.. versionchanged:: 3.8
+ ``cp65001`` is now an alias to ``utf_8``.
+
Python Specific Encodings
-------------------------