From 17ed560fcd0a1442485f9bd48884bbe412f35abc Mon Sep 17 00:00:00 2001 From: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com> Date: Sun, 26 Jun 2022 15:42:01 +0530 Subject: [PATCH] GH-94254: Make _struct module types immutable (#94269) --- Lib/test/test_struct.py | 12 ++++++++++++ .../2022-06-25-16-27-02.gh-issue-94254.beP16v.rst | 1 + Modules/_struct.c | 6 ++++-- 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2022-06-25-16-27-02.gh-issue-94254.beP16v.rst diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py index 8f14ed30588..ab738770546 100644 --- a/Lib/test/test_struct.py +++ b/Lib/test/test_struct.py @@ -689,6 +689,18 @@ def test__struct_reference_cycle_cleaned_up(self): self.assertIsNone( module_ref(), "_struct module was not garbage collected") + @support.cpython_only + def test__struct_types_immutable(self): + # See https://github.com/python/cpython/issues/94254 + + Struct = struct.Struct + unpack_iterator = type(struct.iter_unpack("b", b'x')) + for cls in (Struct, unpack_iterator): + with self.subTest(cls=cls): + with self.assertRaises(TypeError): + cls.x = 1 + + def test_issue35714(self): # Embedded null characters should not be allowed in format strings. for s in '\0', '2\0i', b'\0': diff --git a/Misc/NEWS.d/next/Library/2022-06-25-16-27-02.gh-issue-94254.beP16v.rst b/Misc/NEWS.d/next/Library/2022-06-25-16-27-02.gh-issue-94254.beP16v.rst new file mode 100644 index 00000000000..81482bcd4f8 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-06-25-16-27-02.gh-issue-94254.beP16v.rst @@ -0,0 +1 @@ +Fixed types of :mod:`struct` module to be immutable. Patch by Kumar Aditya. diff --git a/Modules/_struct.c b/Modules/_struct.c index 20307ad15be..9d66568a282 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1741,7 +1741,8 @@ static PyType_Spec unpackiter_type_spec = { "_struct.unpack_iterator", sizeof(unpackiterobject), 0, - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, + (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | + Py_TPFLAGS_IMMUTABLETYPE), unpackiter_type_slots }; @@ -2110,7 +2111,8 @@ static PyType_Spec PyStructType_spec = { "_struct.Struct", sizeof(PyStructObject), 0, - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE, + (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | + Py_TPFLAGS_BASETYPE | Py_TPFLAGS_IMMUTABLETYPE), PyStructType_slots };