bpo-40077: Re-enable pickle test

corona10 · Jun 19, 2020 · Jun 18, 2020 · Jun 18, 2020 · Jun 18, 2020 · Jun 18, 2020
commit fcc972667e81c59fccc36c193d0d0c0f7418f741
diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py
@@ -666,8 +666,7 @@ def testCompress4G(self, size):
             data = None
 
     def testPickle(self):
-        # Why?
-        for proto in range(2, pickle.HIGHEST_PROTOCOL + 1):
+        for proto in range(pickle.HIGHEST_PROTOCOL + 1):
             with self.assertRaises(TypeError):
                 pickle.dumps(BZ2Compressor(), proto)
 
@@ -725,7 +724,6 @@ def testDecompress4G(self, size):
             decompressed = None
 
     def testPickle(self):
-        # Why?
         for proto in range(2, pickle.HIGHEST_PROTOCOL + 1):
             with self.assertRaises(TypeError):
                 pickle.dumps(BZ2Decompressor(), proto)

diff --git a/Modules/_bz2module.c b/Modules/_bz2module.c
@@ -272,6 +272,21 @@ _bz2_BZ2Compressor_flush_impl(BZ2Compressor *self)
     return result;
 }
 
+/*[clinic input]
+_bz2.BZ2Compressor.__reduce__ as _bz2_compressor_reduce
+
+[clinic start generated code]*/
+
+static PyObject *
+_bz2_compressor_reduce_impl(BZ2Compressor *self)
+/*[clinic end generated code: output=8b4e32a4a405409b input=598cfb30699bd0ee]*/
+{
+    PyErr_Format(PyExc_TypeError,
+                 "cannot pickle %s object",
+                 Py_TYPE(self)->tp_name);
+    return NULL;
+}
+
 static void*
 BZ2_Malloc(void* ctx, int items, int size)
 {
@@ -378,13 +393,15 @@ BZ2Compressor_dealloc(BZ2Compressor *self)
 static PyMethodDef BZ2Compressor_methods[] = {
     _BZ2_BZ2COMPRESSOR_COMPRESS_METHODDEF
     _BZ2_BZ2COMPRESSOR_FLUSH_METHODDEF
+    _BZ2_COMPRESSOR_REDUCE_METHODDEF
     {NULL}
 };
 
 static PyType_Slot bz2_compressor_type_slots[] = {
     {Py_tp_dealloc, BZ2Compressor_dealloc},
     {Py_tp_methods, BZ2Compressor_methods},
     {Py_tp_init, _bz2_BZ2Compressor___init__},
+    {Py_tp_new, PyType_GenericNew},
     {Py_tp_doc, (char *)_bz2_BZ2Compressor___init____doc__},
     {0, 0}
 };
@@ -396,7 +413,7 @@ static PyType_Spec bz2_compressor_type_spec = {
     // dbmtype_spec does not have Py_TPFLAGS_BASETYPE flag
     // which prevents to create a subclass.
     // So calling PyType_GetModuleState() in this file is always safe.
-    .flags = Py_TPFLAGS_DEFAULT,
+    .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HEAPTYPE,
     .slots = bz2_compressor_type_slots,
 };
 
@@ -618,6 +635,21 @@ _bz2_BZ2Decompressor_decompress_impl(BZ2Decompressor *self, Py_buffer *data,
     return result;
 }
 
+/*[clinic input]
+_bz2.BZ2Decompressor.__reduce__ as _bz2_decompressor_reduce
+
+[clinic start generated code]*/
+
+static PyObject *
+_bz2_decompressor_reduce_impl(BZ2Decompressor *self)
+/*[clinic end generated code: output=c79772d813bf4271 input=486b9c8c0205e116]*/
+{
+    PyErr_Format(PyExc_TypeError,
+                 "cannot pickle %s object",
+                 Py_TYPE(self)->tp_name);
+    return NULL;
+}
+
 // TODO: Convert it to clinic
 static int
 _bz2_BZ2Decompressor___init___impl(BZ2Decompressor *self)
@@ -703,6 +735,7 @@ BZ2Decompressor_dealloc(BZ2Decompressor *self)
 
 static PyMethodDef BZ2Decompressor_methods[] = {
     _BZ2_BZ2DECOMPRESSOR_DECOMPRESS_METHODDEF
+    _BZ2_DECOMPRESSOR_REDUCE_METHODDEF
     {NULL}
 };
 
@@ -731,6 +764,7 @@ static PyType_Slot bz2_decompressor_type_slots[] = {
     {Py_tp_init, _bz2_BZ2Decompressor___init__},
     {Py_tp_doc, (char *)_bz2_BZ2Decompressor___init____doc__},
     {Py_tp_members, BZ2Decompressor_members},
+    {Py_tp_new, PyType_GenericNew},
     {0, 0}
 };
 

diff --git a/Modules/clinic/_bz2module.c.h b/Modules/clinic/_bz2module.c.h