Skip to content

Commit

Permalink
Merge branch 'main' into pythongh-94682-openssl111q
Browse files Browse the repository at this point in the history
  • Loading branch information
tiran committed Aug 29, 2022
2 parents 8b0ef51 + 9c2b934 commit 2372c45
Show file tree
Hide file tree
Showing 161 changed files with 6,228 additions and 5,593 deletions.
26 changes: 0 additions & 26 deletions .azure-pipelines/find-tools.yml

This file was deleted.

86 changes: 0 additions & 86 deletions .azure-pipelines/libffi-build.yml

This file was deleted.

110 changes: 0 additions & 110 deletions .azure-pipelines/openssl-build.yml

This file was deleted.

71 changes: 0 additions & 71 deletions .azure-pipelines/tcltk-build.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
# https://git-scm.com/docs/gitignore#_pattern_format

# asyncio
**/*asyncio* @1st1 @asvetlov
**/*asyncio* @1st1 @asvetlov @gvanrossum

# Core
**/*context* @1st1
**/*genobject* @1st1 @markshannon
**/*genobject* @markshannon
**/*hamt* @1st1
Objects/set* @rhettinger
Objects/dict* @methane @markshannon
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
*.cover
*.iml
*.o
*.lto
*.a
*.so
*.so.*
*.dylib
*.dSYM
*.dll
*.wasm
*.orig
Expand Down
24 changes: 24 additions & 0 deletions Doc/c-api/init.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1774,6 +1774,18 @@ Python-level trace functions in previous versions.
The caller must hold the :term:`GIL`.
.. c:function:: void PyEval_SetProfileAllThreads(Py_tracefunc func, PyObject *obj)
Like :c:func:`PyEval_SetProfile` but sets the profile function in all running threads
belonging to the current interpreter instead of the setting it only on the current thread.
The caller must hold the :term:`GIL`.
As :c:func:`PyEval_SetProfile`, this function ignores any exceptions raised while
setting the profile functions in all threads.
.. versionadded:: 3.12
.. c:function:: void PyEval_SetTrace(Py_tracefunc func, PyObject *obj)
Expand All @@ -1788,6 +1800,18 @@ Python-level trace functions in previous versions.
The caller must hold the :term:`GIL`.
.. c:function:: void PyEval_SetTraceAllThreads(Py_tracefunc func, PyObject *obj)
Like :c:func:`PyEval_SetTrace` but sets the tracing function in all running threads
belonging to the current interpreter instead of the setting it only on the current thread.
The caller must hold the :term:`GIL`.
As :c:func:`PyEval_SetTrace`, this function ignores any exceptions raised while
setting the trace functions in all threads.
.. versionadded:: 3.12
.. _advanced-debugging:
Expand Down
2 changes: 1 addition & 1 deletion Doc/c-api/intro.rst
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ complete listing.
.. c:macro:: Py_GETENV(s)
Like ``getenv(s)``, but returns ``NULL`` if :option:`-E` was passed on the
command line (i.e. if ``Py_IgnoreEnvironmentFlag`` is set).
command line (see :c:member:`PyConfig.use_environment`).

.. c:macro:: Py_MAX(x, y)
Expand Down
4 changes: 2 additions & 2 deletions Doc/c-api/sys.rst
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ Operating System Utilities
.. versionchanged:: 3.8
The function now uses the UTF-8 encoding on Windows if
:c:data:`Py_LegacyWindowsFSEncodingFlag` is zero;
:c:member:`PyConfig.legacy_windows_fs_encoding` is zero;
.. c:function:: char* Py_EncodeLocale(const wchar_t *text, size_t *error_pos)
Expand Down Expand Up @@ -209,7 +209,7 @@ Operating System Utilities
.. versionchanged:: 3.8
The function now uses the UTF-8 encoding on Windows if
:c:data:`Py_LegacyWindowsFSEncodingFlag` is zero.
:c:member:`PyConfig.legacy_windows_fs_encoding` is zero.
.. _systemfunctions:
Expand Down
Loading

0 comments on commit 2372c45

Please sign in to comment.