Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
6fd7a02
bpo-34008: Py_Main and Py_IsInitialized are preinit functions
ncoghlan Jun 30, 2018
90aea92
Add news entry
ncoghlan Jun 30, 2018
6708545
Fix directive markup
ncoghlan Jun 30, 2018
c2e12cc
Reword Py_Main docs
ncoghlan Jun 30, 2018
eb855e1
Replace note with NEWS entry for Py_Main docs move
ncoghlan Jul 4, 2018
68e37d1
Further pre-initialization test improvements
ncoghlan Jul 4, 2018
f0c8c9d
Adjust wording to be more accurate for 3.6 and 3.7
ncoghlan Aug 23, 2019
e652a86
Add missing word
ncoghlan Aug 23, 2019
225bc42
Fix typo
ncoghlan Aug 23, 2019
036f6f3
Update NEWS entry
ncoghlan Aug 23, 2019
24586e5
Merge remote-tracking branch 'origin/master' into bpo-34008-py-main-a…
ncoghlan Aug 25, 2019
8310a1a
Tweak wording of Py_Main and Py_BytesMain docs
ncoghlan Aug 25, 2019
f3d9713
Tweak presentation order of init functions
ncoghlan Aug 25, 2019
e32d458
Further integrate old and new init API docs
ncoghlan Aug 25, 2019
6b50669
Merge in online PR changes, move InitalizeFromConfig to main init sec…
ncoghlan Aug 25, 2019
fd8d763
Merge branch 'master' into bpo-34008-py-main-after-py-initialize
ncoghlan Jun 28, 2020
70e43bd
Merge remote-tracking branch 'origin/main' into bpo-34008-py-main-aft…
ncoghlan Sep 26, 2024
31b00fb
Merge branch 'main' into bpo-34008-py-main-after-py-initialize
ncoghlan Sep 26, 2024
c6838ca
Fix merge error
ncoghlan Sep 26, 2024
634f1a0
Fix up NEWS entries
ncoghlan Sep 26, 2024
2d75186
Actually reference the init-from-config anchor
ncoghlan Sep 26, 2024
54e5391
Eliminate Py_RunMain docs duplication
ncoghlan Sep 26, 2024
9a6fec5
Fix anchor syntax
ncoghlan Sep 26, 2024
e875817
Replace stale reference to Py_Finalize
ncoghlan Sep 27, 2024
e42ebb5
Fix typo
ncoghlan Sep 27, 2024
0a58fcd
Remove trailing whitespace
ncoghlan Oct 7, 2024
b54aa49
Merge branch 'main' into bpo-34008-py-main-after-py-initialize
ncoghlan Oct 7, 2024
c5bb626
Add back Py_Finalize docs (presumably lost in a merge error)
ncoghlan Oct 7, 2024
aad97ee
Apply suggestions from code review
ncoghlan Oct 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Apply suggestions from code review
Co-authored-by: Carol Willing <carolcode@willingconsulting.com>
  • Loading branch information
ncoghlan and willingc authored Oct 8, 2024
commit aad97ee24a76f70fc5d399aff612a2e9c1207bf3
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
The ``Py_Main`` documentation moved from the "Very High Level API" section to the
The :c:func:`Py_Main` documentation moved from the "Very High Level API" section to the
"Initialization and Finalization" section.

Also make it explicit that we expect ``Py_Main`` to typically be called instead
of ``Py_Initialize`` rather than after it (since ``Py_Main`` makes its own
call to ``Py_Initialize``). However, also document that calling both is
supported, but it's version dependent as to exactly which settings
will be applied correctly in that case.
call to ``Py_Initialize``). Document that calling both is
supported but is version dependent on which settings
will be applied correctly.