Issue #1717: rename tp_compare to tp_reserved. I'll change the

type of tp_compare in a separate commit, for ease of reversion
should things go wrong.

33 files changed, 72 insertions, 72 deletions

diff --git a/Objects/boolobject.c b/Objects/boolobject.c
index eac31b9..3d55543 100644
--- a/Objects/boolobject.c
+++ b/Objects/boolobject.c
@@ -139,7 +139,7 @@ PyTypeObject PyBool_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	bool_repr,				/* tp_repr */
 	&bool_as_number,			/* tp_as_number */
 	0,					/* tp_as_sequence */
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 1c524c1..9e93dda 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -3182,7 +3182,7 @@ PyTypeObject PyByteArray_Type = {
     0,                                  /* tp_print */
     0,                                  /* tp_getattr */
     0,                                  /* tp_setattr */
-    0,                                  /* tp_compare */
+    0,                                  /* tp_reserved */
     (reprfunc)bytes_repr,               /* tp_repr */
     0,                                  /* tp_as_number */
     &bytes_as_sequence,                 /* tp_as_sequence */
@@ -3291,7 +3291,7 @@ PyTypeObject PyByteArrayIter_Type = {
     0,                                 /* tp_print */
     0,                                 /* tp_getattr */
     0,                                 /* tp_setattr */
-    0,                                 /* tp_compare */
+    0,                                 /* tp_reserved */
     0,                                 /* tp_repr */
     0,                                 /* tp_as_number */
     0,                                 /* tp_as_sequence */
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index f9569a7..a4a2e65 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -3089,7 +3089,7 @@ PyTypeObject PyBytes_Type = {
 	0,			 		/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)string_repr, 			/* tp_repr */
 	0,					/* tp_as_number */
 	&string_as_sequence,			/* tp_as_sequence */
@@ -3423,7 +3423,7 @@ PyTypeObject PyBytesIter_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	0,					/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
diff --git a/Objects/cellobject.c b/Objects/cellobject.c
index c2194b7..d7908de 100644
--- a/Objects/cellobject.c
+++ b/Objects/cellobject.c
@@ -154,7 +154,7 @@ PyTypeObject PyCell_Type = {
 	0,                                      /* tp_print */
 	0,	                                /* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)cell_repr,			/* tp_repr */
 	0,					/* tp_as_number */
 	0,			                /* tp_as_sequence */
diff --git a/Objects/classobject.c b/Objects/classobject.c
index 3c2bc3d..d10ab29 100644
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -348,7 +348,7 @@ PyTypeObject PyMethod_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)method_repr,			/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
@@ -614,7 +614,7 @@ PyTypeObject PyInstanceMethod_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)instancemethod_repr,		/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
diff --git a/Objects/cobject.c b/Objects/cobject.c
index c437491..e9b71df 100644
--- a/Objects/cobject.c
+++ b/Objects/cobject.c
@@ -137,7 +137,7 @@ PyTypeObject PyCObject_Type = {
     0,				/*tp_print*/
     0,				/*tp_getattr*/
     0,				/*tp_setattr*/
-    0,				/*tp_compare*/
+    0,				/*tp_reserved*/
     0,				/*tp_repr*/
     0,				/*tp_as_number*/
     0,				/*tp_as_sequence*/
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index 01a637a..65868e4 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -399,7 +399,7 @@ PyTypeObject PyCode_Type = {
 	0,				/* tp_print */
 	0, 				/* tp_getattr */
 	0,				/* tp_setattr */
-	0,		 		/* tp_compare */
+	0,		 		/* tp_reserved */
 	(reprfunc)code_repr,		/* tp_repr */
 	0,				/* tp_as_number */
 	0,				/* tp_as_sequence */
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
index 879d71c..207ecdd0 100644
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -1087,7 +1087,7 @@ PyTypeObject PyComplex_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)complex_repr,			/* tp_repr */
 	&complex_as_number,    			/* tp_as_number */
 	0,					/* tp_as_sequence */
diff --git a/Objects/descrobject.c b/Objects/descrobject.c
index a623925..cfd4b4f 100644
--- a/Objects/descrobject.c
+++ b/Objects/descrobject.c
@@ -392,7 +392,7 @@ PyTypeObject PyMethodDescr_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)method_repr,			/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
@@ -430,7 +430,7 @@ PyTypeObject PyClassMethodDescr_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)method_repr,			/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
@@ -467,7 +467,7 @@ PyTypeObject PyMemberDescr_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)member_repr,			/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
@@ -504,7 +504,7 @@ PyTypeObject PyGetSetDescr_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)getset_repr,			/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
@@ -541,7 +541,7 @@ PyTypeObject PyWrapperDescr_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)wrapperdescr_repr,		/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
@@ -790,7 +790,7 @@ PyTypeObject PyDictProxy_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	0,					/* tp_repr */
 	0,					/* tp_as_number */
 	&proxy_as_sequence,			/* tp_as_sequence */
@@ -1023,7 +1023,7 @@ static PyTypeObject wrappertype = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)wrapper_repr,			/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
@@ -1355,7 +1355,7 @@ PyTypeObject PyProperty_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	0,					/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 1868466..10b6fd8 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -2032,7 +2032,7 @@ PyTypeObject PyDict_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)dict_repr,			/* tp_repr */
 	0,					/* tp_as_number */
 	&dict_as_sequence,			/* tp_as_sequence */
@@ -2226,7 +2226,7 @@ PyTypeObject PyDictIterKey_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	0,					/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
@@ -2298,7 +2298,7 @@ PyTypeObject PyDictIterValue_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	0,					/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
@@ -2384,7 +2384,7 @@ PyTypeObject PyDictIterItem_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	0,					/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
@@ -2699,7 +2699,7 @@ PyTypeObject PyDictKeys_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	0,					/* tp_repr */
 	&dictviews_as_number,			/* tp_as_number */
 	&dictkeys_as_sequence,			/* tp_as_sequence */
@@ -2783,7 +2783,7 @@ PyTypeObject PyDictItems_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	0,					/* tp_repr */
 	&dictviews_as_number,			/* tp_as_number */
 	&dictitems_as_sequence,			/* tp_as_sequence */
@@ -2848,7 +2848,7 @@ PyTypeObject PyDictValues_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	0,					/* tp_repr */
 	0,					/* tp_as_number */
 	&dictvalues_as_sequence,		/* tp_as_sequence */
diff --git a/Objects/enumobject.c b/Objects/enumobject.c
index a76ba04..955bbdc 100644
--- a/Objects/enumobject.c
+++ b/Objects/enumobject.c
@@ -176,7 +176,7 @@ PyTypeObject PyEnum_Type = {
 	0,                              /* tp_print */
 	0,                              /* tp_getattr */
 	0,                              /* tp_setattr */
-	0,                              /* tp_compare */
+	0,                              /* tp_reserved */
 	0,                              /* tp_repr */
 	0,                              /* tp_as_number */
 	0,                              /* tp_as_sequence */
@@ -326,7 +326,7 @@ PyTypeObject PyReversed_Type = {
 	0,                              /* tp_print */
 	0,                              /* tp_getattr */
 	0,                              /* tp_setattr */
-	0,                              /* tp_compare */
+	0,                              /* tp_reserved */
 	0,                              /* tp_repr */
 	0,                              /* tp_as_number */
 	0,				/* tp_as_sequence */
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index 2294500..e5c6c7d 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -320,7 +320,7 @@ static PyTypeObject _PyExc_BaseException = {
     0,                          /*tp_print*/
     0,                          /*tp_getattr*/
     0,                          /*tp_setattr*/
-    0,                          /* tp_compare; */
+    0,                          /* tp_reserved; */
     (reprfunc)BaseException_repr, /*tp_repr*/
     0,                          /*tp_as_number*/
     0,                          /*tp_as_sequence*/
diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index 16ce542..85e87d7 100644
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -490,7 +490,7 @@ PyTypeObject PyStdPrinter_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)stdprinter_repr,		/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index a05b3c6..e77b2dc 100644
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -1819,7 +1819,7 @@ PyTypeObject PyFloat_Type = {
 	0,			 		/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,			 		/* tp_compare */
+	0,			 		/* tp_reserved */
 	(reprfunc)float_repr,			/* tp_repr */
 	&float_as_number,			/* tp_as_number */
 	0,					/* tp_as_sequence */
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 875c6de..52898cc 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -546,7 +546,7 @@ PyTypeObject PyFrame_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	0,					/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index 594e524..1bb2092 100644
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -659,7 +659,7 @@ PyTypeObject PyFunction_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)func_repr,			/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
@@ -805,7 +805,7 @@ PyTypeObject PyClassMethod_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	0,					/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
@@ -952,7 +952,7 @@ PyTypeObject PyStaticMethod_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	0,					/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
diff --git a/Objects/genobject.c b/Objects/genobject.c
index 72ddaef..45f73d6 100644
--- a/Objects/genobject.c
+++ b/Objects/genobject.c
@@ -333,7 +333,7 @@ PyTypeObject PyGen_Type = {
 	0,					/* tp_print */
 	0, 					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)gen_repr,			/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
diff --git a/Objects/iterobject.c b/Objects/iterobject.c
index 95ee56d..174bd98 100644
--- a/Objects/iterobject.c
+++ b/Objects/iterobject.c
@@ -103,7 +103,7 @@ PyTypeObject PySeqIter_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	0,					/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
@@ -207,7 +207,7 @@ PyTypeObject PyCallIter_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	0,					/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
diff --git a/Objects/listobject.c b/Objects/listobject.c
index 40077a1..b834363 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -1784,7 +1784,7 @@ PyTypeObject PySortWrapper_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	0,					/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
@@ -2565,7 +2565,7 @@ PyTypeObject PyList_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)list_repr,			/* tp_repr */
 	0,					/* tp_as_number */
 	&list_as_sequence,			/* tp_as_sequence */
@@ -2631,7 +2631,7 @@ PyTypeObject PyListIter_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	0,					/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
@@ -2753,7 +2753,7 @@ PyTypeObject PyListRevIter_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	0,					/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
diff --git a/Objects/longobject.c b/Objects/longobject.c
index 5476e19..e8d315d 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -3967,7 +3967,7 @@ PyTypeObject PyLong_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	long_repr,				/* tp_repr */
 	&long_as_number,			/* tp_as_number */
 	0,					/* tp_as_sequence */
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
index 0b65d44..0f7d71d 100644
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -805,7 +805,7 @@ PyTypeObject PyMemoryView_Type = {
     0,                                        /* tp_print */
     0,                                        /* tp_getattr */
     0,                                        /* tp_setattr */
-    0,                                        /* tp_compare */
+    0,                                        /* tp_reserved */
     (reprfunc)memory_repr,                    /* tp_repr */
     0,                                        /* tp_as_number */
     0,                                        /* tp_as_sequence */
diff --git a/Objects/methodobject.c b/Objects/methodobject.c
index cb6f1ba..b734b0f 100644
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -254,7 +254,7 @@ PyTypeObject PyCFunction_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)meth_repr,			/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
index 0c6032f..11dd43d 100644
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -379,7 +379,7 @@ PyTypeObject PyModule_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)module_repr,			/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
diff --git a/Objects/object.c b/Objects/object.c
index 49c9852..e134691 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -503,7 +503,7 @@ PyObject_Bytes(PyObject *v)
 /* For Python 3.0.1 and later, the old three-way comparison has been
    completely removed in favour of rich comparisons.  PyObject_Compare() and
    PyObject_Cmp() are gone, and the builtin cmp function no longer exists.
-   The old tp_compare slot will be renamed to tp_reserved, and should no
+   The old tp_compare slot has been renamed to tp_reserved, and should no
    longer be used.  Use tp_richcompare instead.
 
    See (*) below for practical amendments.
@@ -1433,7 +1433,7 @@ static PyTypeObject PyNone_Type = {
 	0,		/*tp_print*/
 	0,		/*tp_getattr*/
 	0,		/*tp_setattr*/
-	0,		/*tp_compare*/
+	0,		/*tp_reserved*/
 	none_repr,	/*tp_repr*/
 	0,		/*tp_as_number*/
 	0,		/*tp_as_sequence*/
@@ -1464,7 +1464,7 @@ static PyTypeObject PyNotImplemented_Type = {
 	0,		/*tp_print*/
 	0,		/*tp_getattr*/
 	0,		/*tp_setattr*/
-	0,		/*tp_compare*/
+	0,		/*tp_reserved*/
 	NotImplemented_repr, /*tp_repr*/
 	0,		/*tp_as_number*/
 	0,		/*tp_as_sequence*/
diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c
index 68f06a4..01114bb 100644
--- a/Objects/rangeobject.c
+++ b/Objects/rangeobject.c
@@ -289,7 +289,7 @@ PyTypeObject PyRange_Type = {
 	0,			/* tp_print */
 	0,			/* tp_getattr */
 	0,			/* tp_setattr */
-	0,			/* tp_compare */
+	0,			/* tp_reserved */
 	(reprfunc)range_repr,	/* tp_repr */
 	0,			/* tp_as_number */
 	&range_as_sequence,	/* tp_as_sequence */
@@ -385,7 +385,7 @@ PyTypeObject PyRangeIter_Type = {
 	0,                                      /* tp_print */
 	0,                                      /* tp_getattr */
 	0,                                      /* tp_setattr */
-	0,                                      /* tp_compare */
+	0,                                      /* tp_reserved */
 	0,                                      /* tp_repr */
 	0,                                      /* tp_as_number */
 	0,					/* tp_as_sequence */
@@ -537,7 +537,7 @@ PyTypeObject PyLongRangeIter_Type = {
 	0,                                      /* tp_print */
 	0,                                      /* tp_getattr */
 	0,                                      /* tp_setattr */
-	0,                                      /* tp_compare */
+	0,                                      /* tp_reserved */
 	0,                                      /* tp_repr */
 	0,                                      /* tp_as_number */
 	0,					/* tp_as_sequence */
diff --git a/Objects/setobject.c b/Objects/setobject.c
index 3dc396c..8ecc405 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -876,7 +876,7 @@ PyTypeObject PySetIter_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	0,					/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
@@ -2104,7 +2104,7 @@ PyTypeObject PySet_Type = {
 	0,				/* tp_print */
 	0,				/* tp_getattr */
 	0,				/* tp_setattr */
-	0,				/* tp_compare */
+	0,				/* tp_reserved */
 	(reprfunc)set_repr,		/* tp_repr */
 	&set_as_number,			/* tp_as_number */
 	&set_as_sequence,		/* tp_as_sequence */
@@ -2201,7 +2201,7 @@ PyTypeObject PyFrozenSet_Type = {
 	0,				/* tp_print */
 	0,				/* tp_getattr */
 	0,				/* tp_setattr */
-	0,				/* tp_compare */
+	0,				/* tp_reserved */
 	(reprfunc)set_repr,		/* tp_repr */
 	&frozenset_as_number,		/* tp_as_number */
 	&set_as_sequence,		/* tp_as_sequence */
diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
index fbf0955..ed3f520 100644
--- a/Objects/sliceobject.c
+++ b/Objects/sliceobject.c
@@ -31,7 +31,7 @@ static PyTypeObject PyEllipsis_Type = {
 	0,				/* tp_print */
 	0,				/* tp_getattr */
 	0,				/* tp_setattr */
-	0,				/* tp_compare */
+	0,				/* tp_reserved */
 	ellipsis_repr,			/* tp_repr */
 	0,				/* tp_as_number */
 	0,				/* tp_as_sequence */
@@ -352,7 +352,7 @@ PyTypeObject PySlice_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,			 		/* tp_compare */
+	0,			 		/* tp_reserved */
 	(reprfunc)slice_repr,   		/* tp_repr */
 	0,					/* tp_as_number */
 	0,	    				/* tp_as_sequence */
diff --git a/Objects/stringlib/string_format.h b/Objects/stringlib/string_format.h
index 3f44e96..b828770 100644
--- a/Objects/stringlib/string_format.h
+++ b/Objects/stringlib/string_format.h
@@ -1064,7 +1064,7 @@ static PyTypeObject PyFormatterIter_Type = {
     0,					/* tp_print */
     0,					/* tp_getattr */
     0,					/* tp_setattr */
-    0,					/* tp_compare */
+    0,					/* tp_reserved */
     0,					/* tp_repr */
     0,					/* tp_as_number */
     0,					/* tp_as_sequence */
@@ -1197,7 +1197,7 @@ static PyTypeObject PyFieldNameIter_Type = {
     0,					/* tp_print */
     0,					/* tp_getattr */
     0,					/* tp_setattr */
-    0,					/* tp_compare */
+    0,					/* tp_reserved */
     0,					/* tp_repr */
     0,					/* tp_as_number */
     0,					/* tp_as_sequence */
diff --git a/Objects/structseq.c b/Objects/structseq.c
index 808f938..54c8deb 100644
--- a/Objects/structseq.c
+++ b/Objects/structseq.c
@@ -440,7 +440,7 @@ static PyTypeObject _struct_sequence_template = {
 	0,                        	        /* tp_print */
 	0,			 		/* tp_getattr */
 	0,					/* tp_setattr */
-	0,               			/* tp_compare */
+	0,               			/* tp_reserved */
 	(reprfunc)structseq_repr,             	/* tp_repr */
 	0,					/* tp_as_number */
 	&structseq_as_sequence,			/* tp_as_sequence */
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index 9da05ee..f7b316b 100644
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -727,7 +727,7 @@ PyTypeObject PyTuple_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)tuplerepr,			/* tp_repr */
 	0,					/* tp_as_number */
 	&tuple_as_sequence,			/* tp_as_sequence */
@@ -930,7 +930,7 @@ PyTypeObject PyTupleIter_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	0,					/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 59890d2..05c9ceb 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2584,7 +2584,7 @@ PyTypeObject PyType_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	(reprfunc)type_repr,			/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
@@ -3357,7 +3357,7 @@ PyTypeObject PyBaseObject_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	object_repr,				/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
@@ -3662,7 +3662,7 @@ inherit_slots(PyTypeObject *type, PyTypeObject *base)
 		type->tp_setattr = base->tp_setattr;
 		type->tp_setattro = base->tp_setattro;
 	}
-	/* tp_compare is ignored, see tp_richcompare */
+	/* tp_reserved is ignored */
 	COPYSLOT(tp_repr);
 	/* tp_hash see tp_richcompare */
 	COPYSLOT(tp_call);
@@ -6250,7 +6250,7 @@ PyTypeObject PySuper_Type = {
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	0,					/* tp_compare */
+	0,					/* tp_reserved */
 	super_repr,				/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 262a7d0..0db13b1 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4566,7 +4566,7 @@ static PyTypeObject EncodingMapType = {
     0,                      /*tp_print*/
     0,                      /*tp_getattr*/
     0,                      /*tp_setattr*/
-    0,                      /*tp_compare*/
+    0,                      /*tp_reserved*/
     0,                      /*tp_repr*/
     0,                      /*tp_as_number*/
     0,                      /*tp_as_sequence*/
@@ -9493,7 +9493,7 @@ PyTypeObject PyUnicode_Type = {
     0,                  /* tp_print */
     0,                  /* tp_getattr */
     0,                  /* tp_setattr */
-    0,                  /* tp_compare */
+    0,                  /* tp_reserved */
     unicode_repr,           /* tp_repr */
     &unicode_as_number,         /* tp_as_number */
     &unicode_as_sequence,       /* tp_as_sequence */
@@ -9799,7 +9799,7 @@ PyTypeObject PyUnicodeIter_Type = {
     0,                  /* tp_print */
     0,                  /* tp_getattr */
     0,                  /* tp_setattr */
-    0,                  /* tp_compare */
+    0,                  /* tp_reserved */
     0,                  /* tp_repr */
     0,                  /* tp_as_number */
     0,                  /* tp_as_sequence */
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
index aa65573..214dd95 100644
--- a/Objects/weakrefobject.c
+++ b/Objects/weakrefobject.c
@@ -342,7 +342,7 @@ _PyWeakref_RefType = {
     0,	                        /*tp_print*/
     0,                          /*tp_getattr*/
     0,                          /*tp_setattr*/
-    0,	                        /*tp_compare*/
+    0,	                        /*tp_reserved*/
     (reprfunc)weakref_repr,     /*tp_repr*/
     0,                          /*tp_as_number*/
     0,                          /*tp_as_sequence*/
@@ -642,7 +642,7 @@ _PyWeakref_ProxyType = {
     0,				        /* tp_print */
     0,				        /* tp_getattr */
     0, 				        /* tp_setattr */
-    0,				        /* tp_compare */
+    0,				        /* tp_reserved */
     (reprfunc)proxy_repr,	        /* tp_repr */
     &proxy_as_number,		        /* tp_as_number */
     &proxy_as_sequence,		        /* tp_as_sequence */
@@ -675,7 +675,7 @@ _PyWeakref_CallableProxyType = {
     0,				        /* tp_print */
     0,				        /* tp_getattr */
     0, 				        /* tp_setattr */
-    0,				        /* tp_compare */
+    0,				        /* tp_reserved */
     (unaryfunc)proxy_repr,	        /* tp_repr */
     &proxy_as_number,		        /* tp_as_number */
     &proxy_as_sequence,		        /* tp_as_sequence */