diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2022-06-26 03:45:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-26 03:45:00 -0700 |
| commit | c481cd6256f0e4493fa28f26c5902101803abadb (patch) | |
| tree | 69bfd6c832289df28de763e7c0830f89708107b7 | |
| parent | 4b1144ced142be2765f5d14c9632cee2b75748f2 (diff) | |
| download | cpython-git-c481cd6256f0e4493fa28f26c5902101803abadb.tar.gz | |
GH-94254: Make _struct module types immutable (GH-94269)
(cherry picked from commit 17ed560fcd0a1442485f9bd48884bbe412f35abc)
Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
| -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 5c2dfabacb..5a9b5de953 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 0000000000..81482bcd4f --- /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 79806ea0d9..cf0a6fdead 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1740,7 +1740,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 }; @@ -2111,7 +2112,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 }; |