[3.14] GH-132983: Remove subclassing support from zstd types (GH-133694) (#133762)

GH-132983: Remove subclassing support from zstd types (GH-133694)

For consistency with ``bz2``, ``lzma``, and ``zlib``.
(cherry picked from commit bd7c5859c6c4f23877afdf6ab7b8209de50127a6)

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>

diff --git a/Modules/_zstd/compressor.c b/Modules/_zstd/compressor.c
index 9a3d8dedcf235eaca7b1c36064c62d5eab8468cc..fc1d3b9d2106397b8d8a13c9f89b7c6f116cf8ed 100644 (file)
--- a/Modules/_zstd/compressor.c
+++ b/Modules/_zstd/compressor.c
@@ -702,6 +702,6 @@ static PyType_Slot zstdcompressor_slots[] = {
 PyType_Spec zstdcompressor_type_spec = {
     .name = "_zstd.ZstdCompressor",
     .basicsize = sizeof(ZstdCompressor),
-    .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC,
+    .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
     .slots = zstdcompressor_slots,
 };

diff --git a/Modules/_zstd/decompressor.c b/Modules/_zstd/decompressor.c
index dec917481ab1b521b1bbd0b60086f3e8efe74cef..4ac28d9c987d8244a7a6fd5becc88cb7ecdf6548 100644 (file)
--- a/Modules/_zstd/decompressor.c
+++ b/Modules/_zstd/decompressor.c
@@ -886,6 +886,6 @@ static PyType_Slot ZstdDecompressor_slots[] = {
 PyType_Spec zstddecompressor_type_spec = {
     .name = "_zstd.ZstdDecompressor",
     .basicsize = sizeof(ZstdDecompressor),
-    .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC,
+    .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
     .slots = ZstdDecompressor_slots,
 };

diff --git a/Modules/_zstd/zstddict.c b/Modules/_zstd/zstddict.c
index a19224c4a6403b36ab4e16f8a70287b5044115fc..53c96b104104e0e8a10c8a93bcda1db80d4bedfe 100644 (file)
--- a/Modules/_zstd/zstddict.c
+++ b/Modules/_zstd/zstddict.c
@@ -281,6 +281,6 @@ static PyType_Slot zstddict_slots[] = {
 PyType_Spec zstddict_type_spec = {
     .name = "_zstd.ZstdDict",
     .basicsize = sizeof(ZstdDict),
-    .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC,
+    .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
     .slots = zstddict_slots,
 };