Skip to content

Commit

Permalink
GH-94254: Make _struct module types immutable (GH-94269)
Browse files Browse the repository at this point in the history
(cherry picked from commit 17ed560)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
  • Loading branch information
miss-islington and kumaraditya303 committed Jun 26, 2022
1 parent 4b1144c commit c481cd6
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
12 changes: 12 additions & 0 deletions Lib/test/test_struct.py
Expand Up @@ -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':
Expand Down
@@ -0,0 +1 @@
Fixed types of :mod:`struct` module to be immutable. Patch by Kumar Aditya.
6 changes: 4 additions & 2 deletions Modules/_struct.c
Expand Up @@ -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
};

Expand Down Expand Up @@ -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
};

Expand Down

0 comments on commit c481cd6

Please sign in to comment.