Skip to content

Commit 319196f

Browse files
authored
Merge branch 'main' into misc_errors
2 parents f15474e + f31ac36 commit 319196f

36 files changed

+452
-241
lines changed

Doc/Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ htmlhelp: build
8888
"build/htmlhelp/pydoc.hhp project file."
8989

9090
.PHONY: latex
91+
latex: _ensure-sphinxcontrib-svg2pdfconverter
9192
latex: BUILDER = latex
9293
latex: build
9394
@echo "Build finished; the LaTeX files are in build/latex."
@@ -231,7 +232,7 @@ dist-text:
231232
@echo "Build finished and archived!"
232233

233234
.PHONY: dist-pdf
234-
dist-pdf:
235+
dist-pdf: _ensure-sphinxcontrib-svg2pdfconverter
235236
# archive the A4 latex
236237
@echo "Building LaTeX (A4 paper)..."
237238
mkdir -p dist
@@ -292,6 +293,10 @@ _ensure-pre-commit:
292293
_ensure-sphinx-autobuild:
293294
$(MAKE) _ensure-package PACKAGE=sphinx-autobuild
294295

296+
.PHONY: _ensure-sphinxcontrib-svg2pdfconverter
297+
_ensure-sphinxcontrib-svg2pdfconverter:
298+
$(MAKE) _ensure-package PACKAGE=sphinxcontrib-svg2pdfconverter
299+
295300
.PHONY: check
296301
check: _ensure-pre-commit
297302
$(VENVDIR)/bin/python3 -m pre_commit run --all-files

Doc/c-api/type.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,10 @@ Type Objects
274274
Return the module object associated with the given type when the type was
275275
created using :c:func:`PyType_FromModuleAndSpec`.
276276
277+
The returned reference is :term:`borrowed <borrowed reference>` from *type*,
278+
and will be valid as long as you hold a reference to *type*.
279+
Do not release it with :c:func:`Py_DECREF` or similar.
280+
277281
If no module is associated with the given type, sets :py:class:`TypeError`
278282
and returns ``NULL``.
279283

Doc/conf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
'linklint.ext',
4747
'notfound.extension',
4848
'sphinxext.opengraph',
49+
'sphinxcontrib.rsvgconverter',
4950
)
5051
for optional_ext in _OPTIONAL_EXTENSIONS:
5152
try:
@@ -556,6 +557,7 @@
556557
# mapping unique short aliases to a base URL and a prefix.
557558
# https://www.sphinx-doc.org/en/master/usage/extensions/extlinks.html
558559
extlinks = {
560+
"oss-fuzz": ("https://issues.oss-fuzz.com/issues/%s", "#%s"),
559561
"pypi": ("https://pypi.org/project/%s/", "%s"),
560562
"source": (SOURCE_URI, "%s"),
561563
}

Doc/data/refcounts.dat

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2427,6 +2427,9 @@ PyType_GetFlags:PyTypeObject*:type:0:
24272427
PyType_GetName:PyObject*::+1:
24282428
PyType_GetName:PyTypeObject*:type:0:
24292429

2430+
PyType_GetModule:PyObject*::0:
2431+
PyType_GetModule:PyTypeObject*:type:0:
2432+
24302433
PyType_GetModuleByToken:PyObject*::+1:
24312434
PyType_GetModuleByToken:PyTypeObject*:type:0:
24322435
PyType_GetModuleByToken:PyModuleDef*:def::

0 commit comments

Comments
 (0)