gh-145056: Fix merging of collections.OrderedDict and frozendict by serhiy-storchaka · Pull Request #146466 · python/cpython

serhiy-storchaka

Merged

serhiy-storchaka

merged 1 commit into

python:mainfrom

serhiy-storchaka:merge-op-ordereddict-frozendict

Mar 30, 2026

Merged

gh-145056: Fix merging of collections.OrderedDict and frozendict#146466
serhiy-storchaka
merged 1 commit into
python:mainfrom
serhiy-storchaka:merge-op-ordereddict-frozendict

Conversation

serhiy-storchaka commented
Mar 26, 2026
•

edited by bedevere-app Bot

Loading

Copy link

Copy Markdown

Member

Issue: Many pure python tools that have a special cases for dict should accept frozendict as well. #145056

serhiy-storchaka requested a review from rhettinger

March 26, 2026 13:00

bedevere-app Bot added the awaiting core review label

Mar 26, 2026

bedevere-app Bot mentioned this pull request

Mar 26, 2026

Many pure python tools that have a special cases for dict should accept frozendict as well. #145056

Open

serhiy-storchaka force-pushed the merge-op-ordereddict-frozendict branch from 0c8cbb0 to 931ae5f Compare

March 26, 2026 13:01

serhiy-storchaka mentioned this pull request

Mar 26, 2026

gh-145056: Fix merging of OrderedDict and UserDict with frozendict #146295

Closed

serhiy-storchaka commented
Mar 26, 2026

Copy link

Copy Markdown

Member Author

This only fixes the case OrderedDict() | frozendict(). The case frozendict() | OrderedDict() is more complex, it will require changes in frozendict. And that issue will be related to frozenset too.

serhiy-storchaka force-pushed the merge-op-ordereddict-frozendict branch from 931ae5f to 0a9b814 Compare

March 26, 2026 13:11

pythongh-145056: Fix merging of collections.OrderedDict and frozendict

01a5ae5

serhiy-storchaka force-pushed the merge-op-ordereddict-frozendict branch from 0a9b814 to 01a5ae5 Compare

March 26, 2026 13:13

vstinner approved these changes Mar 27, 2026

View reviewed changes

vstinner left a comment

Copy link

Copy Markdown

Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

bedevere-app Bot added awaiting merge and removed awaiting core review labels

Mar 27, 2026

serhiy-storchaka merged commit 7278904 into python:main

Mar 30, 2026

96 of 98 checks passed

bedevere-app Bot removed the awaiting merge label

Mar 30, 2026

serhiy-storchaka deleted the merge-op-ordereddict-frozendict branch

March 30, 2026 19:06

maurycy added a commit to maurycy/cpython that referenced this pull request

Mar 31, 2026

Merge branch 'main' into tachyon-ndjson-kolektor

9836ffa

* main:
  pythongh-145458: use `self.skip_idle` consistently in the tachyon profiler (python#145459)
  pythongh-146615: Fix format specifiers in Objects/ directory (pythonGH-146620)
  pythongh-146615: Fix format specifiers in Python/ directory (pythonGH-146619)
  pythongh-146615: Fix format specifiers in test cextensions (pythonGH-146618)
  pythongh-146615: Fix format specifiers in extension modules (pythonGH-146617)
  pythongh-146615: Fix crash in __get__() for METH_METHOD descriptors with invalid type argument (pythonGH-146634)
  pythongh-146376: Reduce timeout in Emscripten GHA workflow (python#146378)
  pythongh-146442: Fix various bugs in compiler pipeline (python#146443)
  pythongh-146238: Support half-floats in the array module (python#146242)
  pythongh-145056: Add support for merging collections.UserDict and frozendict (pythonGH-146465)
  pythongh-145056: Fix merging of collections.OrderedDict and frozendict (pythonGH-146466)
  pythongh-139633: Run netrc file permission check only once per parse (pythonGH-139634)