Skip to content

Commit ede107e

Browse files
committed
Merge branch 'master' into targets-errors
2 parents f0f934d + 2c2a4f3 commit ede107e

File tree

202 files changed

+28015
-38693
lines changed

Some content is hidden

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

202 files changed

+28015
-38693
lines changed

.azure-pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
variables:
6262
testRunTitle: '$(build.sourceBranchName)-linux'
6363
testRunPlatform: linux
64-
openssl_version: 1.1.1f
64+
openssl_version: 1.1.1g
6565

6666
steps:
6767
- template: ./posix-steps.yml
@@ -118,7 +118,7 @@ jobs:
118118
variables:
119119
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
120120
testRunPlatform: linux-coverage
121-
openssl_version: 1.1.1f
121+
openssl_version: 1.1.1g
122122

123123
steps:
124124
- template: ./posix-steps.yml

.azure-pipelines/pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
variables:
6262
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
6363
testRunPlatform: linux
64-
openssl_version: 1.1.1f
64+
openssl_version: 1.1.1g
6565

6666
steps:
6767
- template: ./posix-steps.yml
@@ -118,7 +118,7 @@ jobs:
118118
variables:
119119
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
120120
testRunPlatform: linux-coverage
121-
openssl_version: 1.1.1f
121+
openssl_version: 1.1.1g
122122

123123
steps:
124124
- template: ./posix-steps.yml

.travis.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@ matrix:
8282
packages:
8383
- xvfb
8484
before_script:
85+
- |
86+
if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]
87+
then
88+
echo "Don't run Python coverage on pull requests."
89+
exit
90+
fi
8591
- ./configure
8692
- make -j4
8793
# Need a venv that can parse covered code.
@@ -109,6 +115,12 @@ matrix:
109115
- lcov
110116
- xvfb
111117
before_script:
118+
- |
119+
if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]
120+
then
121+
echo "Don't run C coverage on pull requests."
122+
exit
123+
fi
112124
- ./configure
113125
script:
114126
- xvfb-run make -j4 coverage-report

Doc/c-api/conversion.rst

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,8 @@ not.
2727
2828
The wrappers ensure that *str*[*size*-1] is always ``'\0'`` upon return. They
2929
never write more than *size* bytes (including the trailing ``'\0'``) into str.
30-
Both functions require that ``str != NULL``, ``size > 0`` and ``format !=
31-
NULL``.
32-
33-
If the platform doesn't have :c:func:`vsnprintf` and the buffer size needed to
34-
avoid truncation exceeds *size* by more than 512 bytes, Python aborts with a
35-
:c:func:`Py_FatalError`.
30+
Both functions require that ``str != NULL``, ``size > 0``, ``format != NULL``
31+
and ``size < INT_MAX``.
3632
3733
The return value (*rv*) for these functions should be interpreted as follows:
3834
@@ -48,8 +44,8 @@ The return value (*rv*) for these functions should be interpreted as follows:
4844
this case too, but the rest of *str* is undefined. The exact cause of the error
4945
depends on the underlying platform.
5046
51-
The following functions provide locale-independent string to number conversions.
5247
48+
The following functions provide locale-independent string to number conversions.
5349
5450
.. c:function:: double PyOS_string_to_double(const char *s, char **endptr, PyObject *overflow_exception)
5551

Doc/c-api/init_config.rst

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -695,16 +695,6 @@ PyConfig
695695
696696
:data:`sys._xoptions`.
697697
698-
.. c:member:: int _use_peg_parser
699-
700-
Enable PEG parser? Default: 1.
701-
702-
Set to 0 by :option:`-X oldparser <-X>` and :envvar:`PYTHONOLDPARSER`.
703-
704-
See also :pep:`617`.
705-
706-
.. deprecated-removed:: 3.9 3.10
707-
708698
If ``parse_argv`` is non-zero, ``argv`` arguments are parsed the same
709699
way the regular Python parses command line arguments, and Python
710700
arguments are stripped from ``argv``: see :ref:`Command Line Arguments

Doc/howto/logging-cookbook.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,7 +1368,7 @@ An example dictionary-based configuration
13681368
-----------------------------------------
13691369

13701370
Below is an example of a logging configuration dictionary - it's taken from
1371-
the `documentation on the Django project <https://docs.djangoproject.com/en/1.9/topics/logging/#configuring-logging>`_.
1371+
the `documentation on the Django project <https://docs.djangoproject.com/en/stable/topics/logging/#configuring-logging>`_.
13721372
This dictionary is passed to :func:`~config.dictConfig` to put the configuration into effect::
13731373

13741374
LOGGING = {
@@ -1424,7 +1424,7 @@ This dictionary is passed to :func:`~config.dictConfig` to put the configuration
14241424
}
14251425

14261426
For more information about this configuration, you can see the `relevant
1427-
section <https://docs.djangoproject.com/en/1.9/topics/logging/#configuring-logging>`_
1427+
section <https://docs.djangoproject.com/en/stable/topics/logging/#configuring-logging>`_
14281428
of the Django documentation.
14291429

14301430
.. _cookbook-rotator-namer:

Doc/library/imp.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
**Source code:** :source:`Lib/imp.py`
99

1010
.. deprecated:: 3.4
11-
The :mod:`imp` package is pending deprecation in favor of :mod:`importlib`.
11+
The :mod:`imp` module is deprecated in favor of :mod:`importlib`.
1212

1313
.. index:: statement: import
1414

Doc/library/stdtypes.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4622,6 +4622,12 @@ support membership tests:
46224622
.. versionchanged:: 3.8
46234623
Dictionary views are now reversible.
46244624

4625+
.. describe:: dictview.mapping
4626+
4627+
Return a :class:`types.MappingProxyType` that wraps the original
4628+
dictionary to which the view refers.
4629+
4630+
.. versionadded:: 3.10
46254631

46264632
Keys views are set-like since their entries are unique and hashable. If all
46274633
values are hashable, so that ``(key, value)`` pairs are unique and hashable,
@@ -4661,6 +4667,12 @@ An example of dictionary view usage::
46614667
>>> keys ^ {'sausage', 'juice'}
46624668
{'juice', 'sausage', 'bacon', 'spam'}
46634669

4670+
>>> # get back a read-only proxy for the original dictionary
4671+
>>> values.mapping
4672+
mappingproxy({'eggs': 2, 'sausage': 1, 'bacon': 1, 'spam': 500})
4673+
>>> values.mapping['spam']
4674+
500
4675+
46644676

46654677
.. _typecontextmanager:
46664678

0 commit comments

Comments
 (0)