diff options
author | Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com> | 2022-06-26 10:12:01 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-26 10:12:01 (GMT) |
commit | 17ed560fcd0a1442485f9bd48884bbe412f35abc (patch) | |
tree | a6d11a5d9ea388f6552e3898aa38b1ea9f98ce8c | |
parent | 27934bef2dd9878e04707f090ff5c1ede3278aee (diff) | |
download | cpython-17ed560fcd0a1442485f9bd48884bbe412f35abc.zip cpython-17ed560fcd0a1442485f9bd48884bbe412f35abc.tar.gz cpython-17ed560fcd0a1442485f9bd48884bbe412f35abc.tar.bz2 |
GH-94254: Make _struct module types immutable (#94269)
-rw-r--r-- | Lib/test/test_struct.py | 12 | ||||
-rw-r--r-- | Misc/NEWS.d/next/Library/2022-06-25-16-27-02.gh-issue-94254.beP16v.rst | 1 | ||||
-rw-r--r-- | Modules/_struct.c | 6 |
3 files changed, 17 insertions, 2 deletions
diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py index 8f14ed3..ab73877 100644 --- a/Lib/test/test_struct.py +++ b/Lib/test/test_struct.py @@ -689,6 +689,18 @@ class StructTest(unittest.TestCase): 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 0000000..81482bc --- /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 20307ad..9d66568 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 }; |