Skip to content

Commit 4b3e6f4

Browse files
Merge branch 'main' into tkinter-treeview-9.1
# Conflicts: # Doc/whatsnew/3.16.rst
2 parents 5eca821 + 4de5683 commit 4b3e6f4

21 files changed

Lines changed: 411 additions & 80 deletions

Doc/deprecations/index.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
Deprecations
22
============
33

4-
.. include:: pending-removal-in-3.16.rst
5-
64
.. include:: pending-removal-in-3.17.rst
75

86
.. include:: pending-removal-in-3.18.rst
@@ -20,8 +18,6 @@ Deprecations
2018
C API deprecations
2119
------------------
2220

23-
.. include:: c-api-pending-removal-in-3.16.rst
24-
2521
.. include:: c-api-pending-removal-in-3.18.rst
2622

2723
.. include:: c-api-pending-removal-in-3.19.rst

Doc/library/codecs.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,6 +1399,14 @@ encodings.
13991399
| punycode | | Implement :rfc:`3492`. |
14001400
| | | Stateful codecs are not |
14011401
| | | supported. |
1402+
| | | |
1403+
| | | .. warning:: |
1404+
| | | |
1405+
| | | The decoding and |
1406+
| | | encoding algorithms |
1407+
| | | scale poorly, so |
1408+
| | | limit the length of |
1409+
| | | untrusted input. |
14021410
+--------------------+---------+---------------------------+
14031411
| raw_unicode_escape | | Latin-1 encoding with |
14041412
| | | :samp:`\\u{XXXX}` and |

0 commit comments

Comments
 (0)