diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py
@@ -944,6 +944,15 @@ def test_hash_disallow_instanciation(self):
        ):
            HASHXOF()


class KDFTests(unittest.TestCase):


diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
@@ -345,6 +345,25 @@ def test_constants(self):
        ssl.OP_NO_TLSv1_2
        self.assertEqual(ssl.PROTOCOL_TLS, ssl.PROTOCOL_SSLv23)

    def test_private_init(self):
        with self.assertRaisesRegex(TypeError, "public constructor"):
            with socket.socket() as s:

diff --git a/Modules/_blake2/blake2b_impl.c b/Modules/_blake2/blake2b_impl.c
@@ -409,6 +409,6 @@ static PyType_Slot blake2b_type_slots[] = {
PyType_Spec blake2b_type_spec = {
    .name = "_blake2.blake2b",
    .basicsize =  sizeof(BLAKE2bObject),
-    .flags = Py_TPFLAGS_DEFAULT,
    .slots = blake2b_type_slots
};
diff --git a/Modules/_blake2/blake2s_impl.c b/Modules/_blake2/blake2s_impl.c
@@ -408,6 +408,6 @@ static PyType_Slot blake2s_type_slots[] = {
PyType_Spec blake2s_type_spec = {
    .name = "_blake2.blake2s",
    .basicsize =  sizeof(BLAKE2sObject),
-    .flags = Py_TPFLAGS_DEFAULT,
    .slots = blake2s_type_slots
};
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
@@ -588,7 +588,7 @@ static PyType_Spec EVPtype_spec = {
    "_hashlib.HASH",    /*tp_name*/
    sizeof(EVPobject),  /*tp_basicsize*/
    0,                  /*tp_itemsize*/
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_DISALLOW_INSTANTIATION,
    EVPtype_slots
};

@@ -737,7 +737,7 @@ static PyType_Spec EVPXOFtype_spec = {
    "_hashlib.HASHXOF",    /*tp_name*/
    sizeof(EVPobject),  /*tp_basicsize*/
    0,                  /*tp_itemsize*/
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_DISALLOW_INSTANTIATION,
    EVPXOFtype_slots
};

@@ -1729,7 +1729,7 @@ static PyType_Slot HMACtype_slots[] = {
PyType_Spec HMACtype_spec = {
    "_hashlib.HMAC",    /* name */
    sizeof(HMACobject),     /* basicsize */
-    .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION,
    .slots = HMACtype_slots,
};


diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -437,7 +437,7 @@ static PyType_Spec sslerror_type_spec = {
    "ssl.SSLError",
    sizeof(PyOSErrorObject),
    0,
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
    sslerror_type_slots
};

@@ -2906,7 +2906,7 @@ static PyType_Spec PySSLSocket_spec = {
    "_ssl._SSLSocket",
    sizeof(PySSLSocket),
    0,
-    Py_TPFLAGS_DEFAULT,
    PySSLSocket_slots,
};

@@ -4644,7 +4644,7 @@ static PyType_Spec PySSLContext_spec = {
    "_ssl._SSLContext",
    sizeof(PySSLContext),
    0,
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC,
    PySSLContext_slots,
};

@@ -4850,7 +4850,7 @@ static PyType_Spec PySSLMemoryBIO_spec = {
    "_ssl.MemoryBIO",
    sizeof(PySSLMemoryBIO),
    0,
-    Py_TPFLAGS_DEFAULT,
    PySSLMemoryBIO_slots,
};

@@ -5025,7 +5025,7 @@ static PyType_Spec PySSLSession_spec = {
    "_ssl.SSLSession",
    sizeof(PySSLSession),
    0,
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
    PySSLSession_slots,
};


diff --git a/Modules/_ssl/cert.c b/Modules/_ssl/cert.c
@@ -240,6 +240,6 @@ static PyType_Spec PySSLCertificate_spec = {
    "_ssl.Certificate",
    sizeof(PySSLCertificate),
    0,
-    Py_TPFLAGS_DEFAULT,
    PySSLCertificate_slots,
};
diff --git a/Modules/md5module.c b/Modules/md5module.c
@@ -484,7 +484,7 @@ static PyType_Slot md5_type_slots[] = {
static PyType_Spec md5_type_spec = {
    .name = "_md5.md5",
    .basicsize =  sizeof(MD5object),
-    .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION,
    .slots = md5_type_slots
};


diff --git a/Modules/sha256module.c b/Modules/sha256module.c
@@ -544,14 +544,14 @@ static PyType_Slot sha256_types_slots[] = {
static PyType_Spec sha224_type_spec = {
    .name = "_sha256.sha224",
    .basicsize = sizeof(SHAobject),
-    .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION,
    .slots = sha256_types_slots
};

static PyType_Spec sha256_type_spec = {
    .name = "_sha256.sha256",
    .basicsize = sizeof(SHAobject),
-    .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION,
    .slots = sha256_types_slots
};


diff --git a/Modules/sha512module.c b/Modules/sha512module.c
@@ -602,7 +602,7 @@ static PyType_Slot sha512_sha384_type_slots[] = {
static PyType_Spec sha512_sha384_type_spec = {
    .name = "_sha512.sha384",
    .basicsize =  sizeof(SHAobject),
-    .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION,
    .slots = sha512_sha384_type_slots
};

@@ -619,7 +619,7 @@ static PyType_Slot sha512_sha512_type_slots[] = {
static PyType_Spec sha512_sha512_type_spec = {
    .name = "_sha512.sha512",
    .basicsize =  sizeof(SHAobject),
-    .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION,
    .slots = sha512_sha512_type_slots
};
Original file line number	Diff line number	Diff line change
Expand Up		@@ -944,6 +944,15 @@ def test_hash_disallow_instanciation(self):
		):
		HASHXOF()


		class KDFTests(unittest.TestCase):

Expand Down