Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit43bcd02

Browse files
committed
Merge remote-tracking branch 'upstream/main' into tvobject
2 parentsf4ea500 +872cbc6 commit43bcd02

File tree

165 files changed

+3042
-873
lines changed

Some content is hidden

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

165 files changed

+3042
-873
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name:Read the Docs PR preview
2+
# Automatically edits a pull request's descriptions with a link
3+
# to the documentation's preview on Read the Docs.
4+
5+
on:
6+
pull_request_target:
7+
types:
8+
-opened
9+
paths:
10+
-'Doc/**'
11+
-'.github/workflows/doc.yml'
12+
13+
permissions:
14+
pull-requests:write
15+
16+
concurrency:
17+
group:${{ github.workflow }}-${{ github.head_ref || github.run_id }}
18+
cancel-in-progress:true
19+
20+
jobs:
21+
documentation-links:
22+
runs-on:ubuntu-latest
23+
steps:
24+
-uses:readthedocs/actions/preview@v1
25+
with:
26+
project-slug:"cpython-previews"
27+
single-version:"true"

‎.mailmap‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# This file sets the canonical name for contributors to the repository.
2+
# Documentation: https://git-scm.com/docs/gitmailmap
3+
Amethyst Reese <amethyst@n7.gg> <john@noswap.com>

‎.readthedocs.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Read the Docs configuration file
2+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
3+
# Project page: https://readthedocs.org/projects/cpython-previews/
4+
5+
version:2
6+
7+
sphinx:
8+
configuration:Doc/conf.py
9+
10+
build:
11+
os:ubuntu-22.04
12+
tools:
13+
python:"3"
14+
15+
commands:
16+
-make -C Doc venv html
17+
-mkdir _readthedocs
18+
-mv Doc/build/html _readthedocs/html

‎Doc/c-api/gcsupport.rst‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,31 @@ rules:
5959
Analogous to:c:func:`PyObject_New` but for container objects with the
6060
:const:`Py_TPFLAGS_HAVE_GC` flag set.
6161
62-
6362
..c:function:: TYPE*PyObject_GC_NewVar(TYPE, PyTypeObject *type, Py_ssize_t size)
6463
6564
Analogous to:c:func:`PyObject_NewVar` but for container objects with the
6665
:const:`Py_TPFLAGS_HAVE_GC` flag set.
6766
67+
..c:function:: PyObject*PyUnstable_Object_GC_NewWithExtraData(PyTypeObject *type, size_t extra_size)
68+
69+
Analogous to:c:func:`PyObject_GC_New` but allocates *extra_size*
70+
bytes at the end of the object (at offset
71+
:c:member:`~PyTypeObject.tp_basicsize`).
72+
The allocated memory is initialized to zeros,
73+
except for the :c:type:`Python object header <PyObject>`.
74+
75+
The extra data will be deallocated with the object, but otherwise it is
76+
not managed by Python.
77+
78+
.. warning::
79+
The function is marked as unstable because thefinal mechanism
80+
for reserving extra data after an instance is not yet decided.
81+
For allocating a variable number of fields, prefer using
82+
:c:type:`PyVarObject` and :c:member:`~PyTypeObject.tp_itemsize`
83+
instead.
84+
85+
.. versionadded:: 3.12
86+
6887
6988
.. c:function:: TYPE* PyObject_GC_Resize(TYPE, PyVarObject *op, Py_ssize_t newsize)
7089

‎Doc/conf.py‎

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,13 @@
114114
# Short title used e.g. for <title> HTML tags.
115115
html_short_title='%s Documentation'%release
116116

117-
# Deployment preview information, from Netlify
118-
# (See netlify.toml and https://docs.netlify.com/configure-builds/environment-variables/#git-metadata)
117+
# Deployment preview information
118+
# (See .readthedocs.yml and https://docs.readthedocs.io/en/stable/reference/environment-variables.html)
119+
repository_url=os.getenv("READTHEDOCS_GIT_CLONE_URL")
119120
html_context= {
120-
"is_deployment_preview":os.getenv("IS_DEPLOYMENT_PREVIEW"),
121-
"repository_url":os.getenv("REPOSITORY_URL"),
122-
"pr_id":os.getenv("REVIEW_ID")
121+
"is_deployment_preview":os.getenv("READTHEDOCS_VERSION_TYPE")=="external",
122+
"repository_url":repository_url.removesuffix(".git")ifrepository_urlelseNone,
123+
"pr_id":os.getenv("READTHEDOCS_VERSION")
123124
}
124125

125126
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
@@ -263,11 +264,29 @@
263264

264265
linkcheck_allowed_redirects= {
265266
# bpo-NNNN -> BPO -> GH Issues
266-
r'https://bugs.python.org/issue\?@action=redirect&bpo=\d+':'https://github.com/python/cpython/issues/\d+',
267+
r'https://bugs.python.org/issue\?@action=redirect&bpo=\d+':r'https://github.com/python/cpython/issues/\d+',
267268
# GH-NNNN used to refer to pull requests
268-
r'https://github.com/python/cpython/issues/\d+':'https://github.com/python/cpython/pull/\d+',
269+
r'https://github.com/python/cpython/issues/\d+':r'https://github.com/python/cpython/pull/\d+',
269270
# :source:`something` linking files in the repository
270-
r'https://github.com/python/cpython/tree/.*':'https://github.com/python/cpython/blob/.*'
271+
r'https://github.com/python/cpython/tree/.*':'https://github.com/python/cpython/blob/.*',
272+
# Intentional HTTP use at Misc/NEWS.d/3.5.0a1.rst
273+
r'http://www.python.org/$':'https://www.python.org/$',
274+
# Used in license page, keep as is
275+
r'https://www.zope.org/':r'https://www.zope.dev/',
276+
# Microsoft's redirects to learn.microsoft.com
277+
r'https://msdn.microsoft.com/.*':'https://learn.microsoft.com/.*',
278+
r'https://docs.microsoft.com/.*':'https://learn.microsoft.com/.*',
279+
r'https://go.microsoft.com/fwlink/\?LinkID=\d+':'https://learn.microsoft.com/.*',
280+
# Language redirects
281+
r'https://toml.io':'https://toml.io/en/',
282+
r'https://www.redhat.com':'https://www.redhat.com/en',
283+
# Other redirects
284+
r'https://www.boost.org/libs/.+':r'https://www.boost.org/doc/libs/\d_\d+_\d/.+',
285+
r'https://support.microsoft.com/en-us/help/\d+':'https://support.microsoft.com/en-us/topic/.+',
286+
r'https://perf.wiki.kernel.org$':'https://perf.wiki.kernel.org/index.php/Main_Page',
287+
r'https://www.sqlite.org':'https://www.sqlite.org/index.html',
288+
r'https://mitpress.mit.edu/sicp$':'https://mitpress.mit.edu/9780262510875/structure-and-interpretation-of-computer-programs/',
289+
r'https://www.python.org/psf/':'https://www.python.org/psf-landing/',
271290
}
272291

273292
linkcheck_anchors_ignore= [

‎Doc/faq/extending.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ on what you're trying to do.
4242
.. XXX make sure these all work
4343
4444
`Cython<https://cython.org>`_ and its relative `Pyrex
45-
<https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/>`_ are compilers
45+
<https://www.csse.canterbury.ac.nz/greg.ewing/python/Pyrex/>`_ are compilers
4646
that accept a slightly modified form of Python and generate the corresponding
4747
C code. Cython and Pyrex make it possible to write an extension without having
4848
to learn Python's C API.

‎Doc/faq/general.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ commercial use, to sell copies of Python in source or binary form (modified or
5454
unmodified), or to sell products that incorporate Python in some form. We would
5555
still like to know about all commercial use of Python, of course.
5656

57-
See `thePSFlicense page<https://www.python.org/psf/license/>`_ to find further
58-
explanations anda link tothe full text of thelicense.
57+
See `the license page<https://docs.python.org/3/license.html>`_ to find further
58+
explanations and the full text of thePSF License.
5959

6060
The Python logo is trademarked, and in certain cases permission is required to
6161
use it. Consult `the Trademark Usage Policy
@@ -215,7 +215,7 @@ every day, and Usenet readers are often more able to cope with this volume.
215215
Announcements of new software releases and events can be found in
216216
comp.lang.python.announce, a low-traffic moderated list that receives about five
217217
postings per day. It's available as `the python-announce mailing list
218-
<https://mail.python.org/mailman/listinfo/python-announce-list>`_.
218+
<https://mail.python.org/mailman3/lists/python-announce-list.python.org/>`_.
219219

220220
More info about other mailing lists and newsgroups
221221
can be found at https://www.python.org/community/lists/.
@@ -352,7 +352,7 @@ titled "Python X.Y Release Schedule", where X.Y is a version that hasn't been
352352
publicly released yet.
353353

354354
New development is discussed on `the python-dev mailing list
355-
<https://mail.python.org/mailman/listinfo/python-dev/>`_.
355+
<https://mail.python.org/mailman3/lists/python-dev.python.org/>`_.
356356

357357

358358
Is it reasonable to propose incompatible changes to Python?

‎Doc/faq/programming.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Yes.
6161
`Pyflakes<https://github.com/PyCQA/pyflakes>`_ do basic checking that will
6262
help you catch bugs sooner.
6363

64-
Static type checkers such as `Mypy<http://mypy-lang.org/>`_,
64+
Static type checkers such as `Mypy<https://mypy-lang.org/>`_,
6565
`Pyre<https://pyre-check.org/>`_, and
6666
`Pytype<https://github.com/google/pytype>`_ can check type hints in Python
6767
source code.

‎Doc/howto/pyporting.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ to make sure everything functions as expected in both versions of Python.
438438
.. _Futurize:https://python-future.org/automatic_conversion.html
439439
.. _importlib2:https://pypi.org/project/importlib2
440440
.. _Modernize:https://python-modernize.readthedocs.io/
441-
.. _mypy:http://mypy-lang.org/
441+
.. _mypy:https://mypy-lang.org/
442442
.. _Porting to Python 3:http://python3porting.com/
443443
.. _Pylint:https://pypi.org/project/pylint
444444

‎Doc/library/asyncio-eventloop.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ Opening network connections
529529
specifies requirements for algorithms that reduce this user-visible
530530
delay and provides an algorithm.
531531

532-
For more information: https://tools.ietf.org/html/rfc6555
532+
For more information: https://datatracker.ietf.org/doc/html/rfc6555
533533

534534
..versionchanged::3.11
535535

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp