Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 74bdf1b

Browse files
rhettingerrhettinger
committed
Merge branch 'master' of github.com:python/cpython
2 parents bbd2da9 + 690aca7 commit 74bdf1b

File tree

92 files changed

+6723
-9570
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+6723
-9570
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127

128128
build_ubuntu:
129129
name: 'Ubuntu'
130-
runs-on: ubuntu-18.04
130+
runs-on: ubuntu-20.04
131131
needs: check_source
132132
if: needs.check_source.outputs.run_tests == 'true'
133133
env:

‎Doc/c-api/concrete.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,3 @@ Other Objects
115115
coro.rst
116116
contextvars.rst
117117
datetime.rst
118-
decimal.rst

‎Doc/c-api/decimal.rst‎

Lines changed: 0 additions & 231 deletions
This file was deleted.

‎Doc/c-api/unicode.rst‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,10 @@ Extension modules can continue using them, as they will not be removed in Python
725725
:c:type:`Py_UNICODE` buffer of the given *size* by ASCII digits 0--9
726726
according to their decimal value. Return ``NULL`` if an exception occurs.
727727
728+
.. deprecated-removed:: 3.3 3.11
729+
Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using
730+
:c:func:`Py_UNICODE_TODECIMAL`.
731+
728732
729733
.. c:function:: Py_UNICODE* PyUnicode_AsUnicodeAndSize(PyObject *unicode, Py_ssize_t *size)
730734
@@ -1043,7 +1047,7 @@ These are the generic codec APIs:
10431047
to be used is looked up using the Python codec registry. Return ``NULL`` if an
10441048
exception was raised by the codec.
10451049
1046-
.. deprecated-removed:: 3.3 4.0
1050+
.. deprecated-removed:: 3.3 3.11
10471051
Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using
10481052
:c:func:`PyUnicode_AsEncodedString`.
10491053
@@ -1116,7 +1120,7 @@ These are the UTF-8 codec APIs:
11161120
return a Python bytes object. Return ``NULL`` if an exception was raised by
11171121
the codec.
11181122
1119-
.. deprecated-removed:: 3.3 4.0
1123+
.. deprecated-removed:: 3.3 3.11
11201124
Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using
11211125
:c:func:`PyUnicode_AsUTF8String`, :c:func:`PyUnicode_AsUTF8AndSize` or
11221126
:c:func:`PyUnicode_AsEncodedString`.
@@ -1190,7 +1194,7 @@ These are the UTF-32 codec APIs:
11901194
11911195
Return ``NULL`` if an exception was raised by the codec.
11921196
1193-
.. deprecated-removed:: 3.3 4.0
1197+
.. deprecated-removed:: 3.3 3.11
11941198
Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using
11951199
:c:func:`PyUnicode_AsUTF32String` or :c:func:`PyUnicode_AsEncodedString`.
11961200
@@ -1265,7 +1269,7 @@ These are the UTF-16 codec APIs:
12651269
12661270
Return ``NULL`` if an exception was raised by the codec.
12671271
1268-
.. deprecated-removed:: 3.3 4.0
1272+
.. deprecated-removed:: 3.3 3.11
12691273
Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using
12701274
:c:func:`PyUnicode_AsUTF16String` or :c:func:`PyUnicode_AsEncodedString`.
12711275
@@ -1303,7 +1307,7 @@ These are the UTF-7 codec APIs:
13031307
nonzero, whitespace will be encoded in base-64. Both are set to zero for the
13041308
Python "utf-7" codec.
13051309
1306-
.. deprecated-removed:: 3.3 4.0
1310+
.. deprecated-removed:: 3.3 3.11
13071311
Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using
13081312
:c:func:`PyUnicode_AsEncodedString`.
13091313
@@ -1333,7 +1337,7 @@ These are the "Unicode Escape" codec APIs:
13331337
Encode the :c:type:`Py_UNICODE` buffer of the given *size* using Unicode-Escape and
13341338
return a bytes object. Return ``NULL`` if an exception was raised by the codec.
13351339
1336-
.. deprecated-removed:: 3.3 4.0
1340+
.. deprecated-removed:: 3.3 3.11
13371341
Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using
13381342
:c:func:`PyUnicode_AsUnicodeEscapeString`.
13391343
@@ -1364,7 +1368,7 @@ These are the "Raw Unicode Escape" codec APIs:
13641368
Encode the :c:type:`Py_UNICODE` buffer of the given *size* using Raw-Unicode-Escape
13651369
and return a bytes object. Return ``NULL`` if an exception was raised by the codec.
13661370
1367-
.. deprecated-removed:: 3.3 4.0
1371+
.. deprecated-removed:: 3.3 3.11
13681372
Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using
13691373
:c:func:`PyUnicode_AsRawUnicodeEscapeString` or
13701374
:c:func:`PyUnicode_AsEncodedString`.
@@ -1396,7 +1400,7 @@ ordinals and only these are accepted by the codecs during encoding.
13961400
return a Python bytes object. Return ``NULL`` if an exception was raised by
13971401
the codec.
13981402
1399-
.. deprecated-removed:: 3.3 4.0
1403+
.. deprecated-removed:: 3.3 3.11
14001404
Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using
14011405
:c:func:`PyUnicode_AsLatin1String` or
14021406
:c:func:`PyUnicode_AsEncodedString`.
@@ -1428,7 +1432,7 @@ codes generate errors.
14281432
return a Python bytes object. Return ``NULL`` if an exception was raised by
14291433
the codec.
14301434
1431-
.. deprecated-removed:: 3.3 4.0
1435+
.. deprecated-removed:: 3.3 3.11
14321436
Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using
14331437
:c:func:`PyUnicode_AsASCIIString` or
14341438
:c:func:`PyUnicode_AsEncodedString`.
@@ -1480,7 +1484,7 @@ These are the mapping codec APIs:
14801484
*mapping* object and return the result as a bytes object. Return ``NULL`` if
14811485
an exception was raised by the codec.
14821486
1483-
.. deprecated-removed:: 3.3 4.0
1487+
.. deprecated-removed:: 3.3 3.11
14841488
Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using
14851489
:c:func:`PyUnicode_AsCharmapString` or
14861490
:c:func:`PyUnicode_AsEncodedString`.
@@ -1512,7 +1516,7 @@ The following codec API is special in that maps Unicode to Unicode.
15121516
character *mapping* table to it and return the resulting Unicode object.
15131517
Return ``NULL`` when an exception was raised by the codec.
15141518
1515-
.. deprecated-removed:: 3.3 4.0
1519+
.. deprecated-removed:: 3.3 3.11
15161520
Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using
15171521
:c:func:`PyUnicode_Translate`. or :ref:`generic codec based API
15181522
<codec-registry>`

‎Doc/data/stable_abi.dat‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,6 @@ Py_SetPath
776776
Py_SetProgramName
777777
Py_SetPythonHome
778778
Py_SetRecursionLimit
779-
Py_SymtableString
780779
Py_UTF8Mode
781780
Py_VaBuildValue
782781
Py_XNewRef

‎Doc/library/socket.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,9 @@ The following functions all create :ref:`socket objects <socket-objects>`.
610610
.. versionchanged:: 3.9
611611
The CAN_J1939 protocol was added.
612612

613+
.. versionchanged:: 3.10
614+
The IPPROTO_MPTCP protocol was added.
615+
613616
.. function:: socketpair([family[, type[, proto]]])
614617

615618
Build a pair of connected socket objects using the given address family, socket

‎Doc/library/ssl.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,13 @@ Constants
634634

635635
.. versionadded:: 3.4
636636

637+
.. data:: VERIFY_ALLOW_PROXY_CERTS
638+
639+
Possible value for :attr:`SSLContext.verify_flags` to enables proxy
640+
certificate verification.
641+
642+
.. versionadded:: 3.10
643+
637644
.. data:: VERIFY_X509_TRUSTED_FIRST
638645

639646
Possible value for :attr:`SSLContext.verify_flags`. It instructs OpenSSL to

0 commit comments

Comments
 (0)