FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-141510: Fix frozendict.fromkeys() for subclasses by vstinner · Pull Request #144947 · python/cpython · GitHub

/ cpython Public

gh-141510: Fix frozendict.fromkeys() for subclasses #144947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vstinner wants to merge 1 commit into from
Conversation 5 Commits 1 Checks 47 Files changed
Closed

gh-141510: Fix frozendict.fromkeys() for subclasses #144947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .c  (1) .py  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
17 changes: 17 additions & 0 deletions Lib/test/test_dict.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1787,6 +1787,23 @@ def test_hash(self):
with self.assertRaisesRegex(TypeError, "unhashable type: 'list'"):
hash(fd)

def test_fromkeys(self):
self.assertEqual(frozendict.fromkeys('abc'),
frozendict(a=None, b=None, c=None))

# frozendict.fromkeys() must not call subclass constructor
class FrozenDictSubclass(frozendict):
def __new__(self):
raise ValueError("must not be called")

fd = FrozenDictSubclass.fromkeys("abc")
self.assertEqual(fd, frozendict(a=None, b=None, c=None))
self.assertEqual(type(fd), FrozenDictSubclass)

fd = FrozenDictSubclass.fromkeys(frozendict(x=1))
self.assertEqual(fd, frozendict(x=None))
self.assertEqual(type(fd), FrozenDictSubclass)


if __name__ == "__main__":
unittest.main()
17 changes: 13 additions & 4 deletions Objects/dictobject.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -3285,10 +3285,17 @@ _PyDict_FromKeys(PyObject *cls, PyObject *iterable, PyObject *value)
PyObject *d;
int status;

d = _PyObject_CallNoArgs(cls);
if (d == NULL)
if (PyObject_IsSubclass(cls, (PyObject*)&PyFrozenDict_Type)) {
// Never call frozendict subclass constructor which would call
// arbitrary Python code.
d = frozendict_new(_PyType_CAST(cls), NULL, NULL);
}
else {
d = _PyObject_CallNoArgs(cls);
}
if (d == NULL) {
return NULL;

}

if (PyDict_CheckExact(d)) {
if (PyDict_CheckExact(iterable)) {
Expand Down Expand Up @@ -3359,7 +3366,7 @@ _PyDict_FromKeys(PyObject *cls, PyObject *iterable, PyObject *value)
dict_iter_exit:;
Py_END_CRITICAL_SECTION();
}
else if (PyFrozenDict_CheckExact(d)) {
else if (PyFrozenDict_Check(d)) {
while ((key = PyIter_Next(it)) != NULL) {
// anydict_setitem_take2 consumes a reference to key
status = anydict_setitem_take2((PyDictObject *)d,
Expand Down Expand Up @@ -7994,6 +8001,8 @@ frozendict_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
if (d == NULL) {
return NULL;
}
assert(Py_REFCNT(d) == 1);

PyFrozenDictObject *self = _PyFrozenDictObject_CAST(d);
self->ma_hash = -1;

Expand Down
Loading
Back | FazBrowse Home | New Git URL