Skip to content
Merged
Changes from 1 commit
Commits
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
Next Next commit
Fix merge snafu in What's New.
  • Loading branch information
Yhg1s committed Sep 29, 2024
commit ffcd5134378d3c89f4e27e5c84433b2aafef9d25
26 changes: 0 additions & 26 deletions Doc/whatsnew/3.13.rst
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,6 @@ fractions
(Contributed by Mark Dickinson in :gh:`111320`.)


<<<<<<< HEAD
gc
--

Expand Down Expand Up @@ -939,31 +938,6 @@ may not work exactly as intended, but it is very unlikely to be harmful.
All other code will work just fine.


||||||| 15309329b65 (GH-108362: Incremental Cycle GC (GH-116206))
gc
--

* The cyclic garbage collector is now incremental, which changes the meanings
of the results of :meth:`gc.get_threshold` and :meth:`gc.get_threshold` as
well as :meth:`gc.get_count` and :meth:`gc.get_stats`.
* :meth:`gc.get_threshold` returns a three-tuple for backwards compatibility,
the first value is the threshold for young collections, as before, the second
value determines the rate at which the old collection is scanned; the
default is 10 and higher values mean that the old collection is scanned more slowly.
The third value is meangless and is always zero.
* :meth:`gc.set_threshold` ignores any items after the second.
* :meth:`gc.get_count` and :meth:`gc.get_stats`.
These functions return the same format of results as before.
The only difference is that instead of the results refering to
the young, aging and old generations, the results refer to the
young generation and the aging and collecting spaces of the old generation.

In summary, code that attempted to manipulate the behavior of the cycle GC may
not work exactly as intended, but it is very unlikely to harmful.
All other code will work just fine.

=======
>>>>>>> parent of 15309329b65 (GH-108362: Incremental Cycle GC (GH-116206))
glob
----

Expand Down