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.

diff --git a/Include/object.h b/Include/object.h
index 30538b50422542b97eae61698ee5311e1263ea33..592ee0294d8902f9483d3b205e5e4dda187a7fdb 100644 (file)
--- a/Include/object.h
+++ b/Include/object.h
@@ -297,7 +297,7 @@ typedef struct _typeobject {
        printfunc tp_print;
        getattrfunc tp_getattr;
        setattrfunc tp_setattr;
-       cmpfunc tp_compare;
+       cmpfunc tp_reserved;
        reprfunc tp_repr;
 
        /* Method suites for standard classes */

diff --git a/Misc/NEWS b/Misc/NEWS
index 96d0e7333eec6fd1c9907b0249e7fa4252a8daed..36dfa2c651d92513b7c04d8a27b18411a94571df 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -14,9 +14,8 @@ Core and Builtins
 
 - Issue #1717: Removed builtin cmp() function, dropped tp_compare
   slot, the C API functions PyObject_Compare and PyUnicode_Compare and
-  the type definition cmpfunc.  The tp_compare slot is reserved for
-  future usage.  An attempt to initialize a type with a nonzero
-  tp_compare slot will raise TypeError.
+  the type definition cmpfunc.  The tp_compare slot has been renamed
+  to tp_reserved, and is reserved for future usage.
 
 - Issue #4707: round(x, n) now returns an integer if x is an integer.
   Previously it returned a float.

diff --git a/Modules/_bytesio.c b/Modules/_bytesio.c
index 48fe50a09411ca5ec7205177e1a53a9a1ec1f506..2cea0fcb7f563686b2075104cf883c304f2c9a20 100644 (file)
--- a/Modules/_bytesio.c
+++ b/Modules/_bytesio.c
@@ -698,7 +698,7 @@ static PyTypeObject BytesIO_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/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index 1b855e11816d67478751adfce3e0be881c7bfd1b..20f30f4fc04858e8ed2c84c71f413d16ef9c4307 100644 (file)
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -848,7 +848,7 @@ static PyTypeObject deque_type = {
        0,                              /* tp_print */
        0,                              /* tp_getattr */
        0,                              /* tp_setattr */
-       0,                              /* tp_compare */
+       0,                              /* tp_reserved */
        deque_repr,                     /* tp_repr */
        0,                              /* tp_as_number */
        &deque_as_sequence,             /* tp_as_sequence */
@@ -978,7 +978,7 @@ static PyTypeObject dequeiter_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 */
@@ -1061,7 +1061,7 @@ static PyTypeObject dequereviter_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 */
@@ -1318,7 +1318,7 @@ static PyTypeObject defdict_type = {
        0,                              /* tp_print */
        0,                              /* tp_getattr */
        0,                              /* tp_setattr */
-       0,                              /* tp_compare */
+       0,                              /* tp_reserved */
        (reprfunc)defdict_repr,         /* tp_repr */
        0,                              /* tp_as_number */
        0,                              /* tp_as_sequence */

diff --git a/Modules/_csv.c b/Modules/_csv.c
index 5175e71919a1d47c55b93411b6dccbfce754fb6f..1fbba41db7ecbec10352c4da0b41b66bde7c4d98 100644 (file)
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -443,7 +443,7 @@ static PyTypeObject Dialect_Type = {
        (printfunc)0,                           /* tp_print */
        (getattrfunc)0,                         /* tp_getattr */
        (setattrfunc)0,                         /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        (reprfunc)0,                            /* tp_repr */
        0,                                      /* tp_as_number */
        0,                                      /* tp_as_sequence */
@@ -864,7 +864,7 @@ static PyTypeObject Reader_Type = {
        (printfunc)0,                           /*tp_print*/
        (getattrfunc)0,                         /*tp_getattr*/
        (setattrfunc)0,                         /*tp_setattr*/
-       0,                                     /*tp_compare*/
+       0,                                     /*tp_reserved*/
        (reprfunc)0,                            /*tp_repr*/
        0,                                      /*tp_as_number*/
        0,                                      /*tp_as_sequence*/
@@ -1286,7 +1286,7 @@ static PyTypeObject Writer_Type = {
        (printfunc)0,                           /*tp_print*/
        (getattrfunc)0,                         /*tp_getattr*/
        (setattrfunc)0,                         /*tp_setattr*/
-       0,                                      /*tp_compare*/
+       0,                                      /*tp_reserved*/
        (reprfunc)0,                            /*tp_repr*/
        0,                                      /*tp_as_number*/
        0,                                      /*tp_as_sequence*/

diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index a003a6cf3757f224c5742031de3489f9bb9a56fe..9eb497538e3e45c84ff8f5250409fca5abfbf9cf 100644 (file)
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -179,7 +179,7 @@ static PyTypeObject DictRemover_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 */
@@ -713,7 +713,7 @@ PyTypeObject StructType_Type = {
        0,                                      /* tp_print */
        0,                                      /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        0,                                      /* tp_repr */
        0,                                      /* tp_as_number */
        &CDataType_as_sequence,                 /* tp_as_sequence */
@@ -755,7 +755,7 @@ static PyTypeObject UnionType_Type = {
        0,                                      /* tp_print */
        0,                                      /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        0,                                      /* tp_repr */
        0,                                      /* tp_as_number */
        &CDataType_as_sequence,         /* tp_as_sequence */
@@ -988,7 +988,7 @@ PyTypeObject PointerType_Type = {
        0,                                      /* tp_print */
        0,                                      /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        0,                                      /* tp_repr */
        0,                                      /* tp_as_number */
        &CDataType_as_sequence,         /* tp_as_sequence */
@@ -1390,7 +1390,7 @@ PyTypeObject ArrayType_Type = {
        0,                                      /* tp_print */
        0,                                      /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        0,                                      /* tp_repr */
        0,                                      /* tp_as_number */
        &CDataType_as_sequence,                 /* tp_as_sequence */
@@ -2059,7 +2059,7 @@ PyTypeObject SimpleType_Type = {
        0,                                      /* tp_print */
        0,                                      /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        0,                                      /* tp_repr */
        0,                                      /* tp_as_number */
        &CDataType_as_sequence,         /* tp_as_sequence */
@@ -2277,7 +2277,7 @@ PyTypeObject CFuncPtrType_Type = {
        0,                                      /* tp_print */
        0,                                      /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        0,                                      /* tp_repr */
        0,                                      /* tp_as_number */
        &CDataType_as_sequence,                 /* tp_as_sequence */
@@ -2560,7 +2560,7 @@ PyTypeObject CData_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 */
@@ -3889,7 +3889,7 @@ PyTypeObject CFuncPtr_Type = {
        0,                                      /* tp_print */
        0,                                      /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        (reprfunc)CFuncPtr_repr,                /* tp_repr */
        &CFuncPtr_as_number,                    /* tp_as_number */
        0,                                      /* tp_as_sequence */
@@ -4032,7 +4032,7 @@ static PyTypeObject Struct_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 */
@@ -4074,7 +4074,7 @@ static PyTypeObject Union_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 */
@@ -4383,7 +4383,7 @@ PyTypeObject Array_Type = {
        0,                                      /* tp_print */
        0,                                      /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        0,                                      /* tp_repr */
        0,                                      /* tp_as_number */
        &Array_as_sequence,                     /* tp_as_sequence */
@@ -4615,7 +4615,7 @@ static PyTypeObject Simple_Type = {
        0,                                      /* tp_print */
        0,                                      /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        (reprfunc)&Simple_repr,                 /* tp_repr */
        &Simple_as_number,                      /* tp_as_number */
        0,                                      /* tp_as_sequence */
@@ -4992,7 +4992,7 @@ PyTypeObject Pointer_Type = {
        0,                                      /* tp_print */
        0,                                      /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        0,                                      /* tp_repr */
        &Pointer_as_number,                     /* tp_as_number */
        &Pointer_as_sequence,                   /* tp_as_sequence */
@@ -5086,7 +5086,7 @@ static PyTypeObject PyComError_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/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c
index 80b4cdeadb97ef50cd3a5be5bf3b6607a81d19a5..ed86ee503fa3094c8f9028e565a43a16845ef926 100644 (file)
--- a/Modules/_ctypes/callbacks.c
+++ b/Modules/_ctypes/callbacks.c
@@ -50,7 +50,7 @@ PyTypeObject CThunk_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/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
index bf0de88f7978aaeff27214692bb3cbd140416e6d..3bd6d664ef583ee22e387b8ea8732d4475117e30 100644 (file)
--- a/Modules/_ctypes/callproc.c
+++ b/Modules/_ctypes/callproc.c
@@ -512,7 +512,7 @@ PyTypeObject PyCArg_Type = {
        0,                                      /* tp_print */
        0,                                      /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        (reprfunc)PyCArg_repr,                  /* tp_repr */
        0,                                      /* tp_as_number */
        0,                                      /* tp_as_sequence */

diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c
index ecb86beb9bbea66586d0d17c72330065299d279d..7f07b7a1247812824de6174e973d7087a69f045f 100644 (file)
--- a/Modules/_ctypes/cfield.c
+++ b/Modules/_ctypes/cfield.c
@@ -289,7 +289,7 @@ PyTypeObject CField_Type = {
        0,                                      /* tp_print */
        0,                                      /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        (reprfunc)CField_repr,                  /* tp_repr */
        0,                                      /* tp_as_number */
        0,                                      /* tp_as_sequence */

diff --git a/Modules/_ctypes/stgdict.c b/Modules/_ctypes/stgdict.c
index 7db3e0faa20db72753c4b72043ad3f084e3e4d10..f1a5463543c5082ebfd7d942a0491dcc04deb096 100644 (file)
--- a/Modules/_ctypes/stgdict.c
+++ b/Modules/_ctypes/stgdict.c
@@ -111,7 +111,7 @@ PyTypeObject StgDict_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/Modules/_curses_panel.c b/Modules/_curses_panel.c
index 26cea8ca45bf3bde77f1b65899b47dabec10e910..02e064fe7c867437dbdd1a246366e00b6ab4e432 100644 (file)
--- a/Modules/_curses_panel.c
+++ b/Modules/_curses_panel.c
@@ -341,7 +341,7 @@ PyTypeObject PyCursesPanel_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/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index 3764f482af7cbdaa7f0e724d26e8f3ccad8db768..9bc74a61f4e732345602c462693e48dc6b86c578 100644 (file)
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -1662,7 +1662,7 @@ PyTypeObject PyCursesWindow_Type = {
        0,                      /*tp_print*/
        (getattrfunc)0,         /*tp_getattr*/
        (setattrfunc)0,         /*tp_setattr*/
-       0,                      /*tp_compare*/
+       0,                      /*tp_reserved*/
        0,                      /*tp_repr*/
        0,                      /*tp_as_number*/
        0,                      /*tp_as_sequence*/

diff --git a/Modules/_dbmmodule.c b/Modules/_dbmmodule.c
index 80c73bf0da2649ce9a5078d4bb4d9eff000c63bb..885c3aa1cff87d96c09aadeaf665a93e49820351 100644 (file)
--- a/Modules/_dbmmodule.c
+++ b/Modules/_dbmmodule.c
@@ -337,7 +337,7 @@ static PyTypeObject Dbmtype = {
        0,                        /*tp_print*/
        0,                        /*tp_getattr*/
        0,                        /*tp_setattr*/
-       0,                        /*tp_compare*/
+       0,                        /*tp_reserved*/
        0,                        /*tp_repr*/
        0,                        /*tp_as_number*/
        &dbm_as_sequence,         /*tp_as_sequence*/

diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index 46c19eb1828ea8e1dc612491d91ad23feebef071..ac118b4d6eecf67284112277b90e6de0ddf11d9f 100644 (file)
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -1379,7 +1379,7 @@ static PyTypeObject Element_Type = {
     0, /* tp_print */
     0, /* tp_getattr */
     (setattrfunc)element_setattr, /* tp_setattr */
-    0, /* tp_compare */
+    0, /* tp_reserved */
     (reprfunc)element_repr, /* tp_repr */
     0, /* tp_as_number */
     &element_as_sequence, /* tp_as_sequence */
@@ -1803,7 +1803,7 @@ static PyTypeObject TreeBuilder_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 */
@@ -2559,7 +2559,7 @@ static PyTypeObject XMLParser_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/Modules/_fileio.c b/Modules/_fileio.c
index 7a71837d7bb5a17ef800af4aa570c67117edcb60..339a1d7dbaaf6224981c52c9c4ed15099c7d4d84 100644 (file)
--- a/Modules/_fileio.c
+++ b/Modules/_fileio.c
@@ -907,7 +907,7 @@ PyTypeObject PyFileIO_Type = {
        0,                                      /* tp_print */
        0,                                      /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        (reprfunc)fileio_repr,                  /* tp_repr */
        0,                                      /* tp_as_number */
        0,                                      /* tp_as_sequence */

diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
index 731d02826ba04d12b2d293f65264622595f2a4a0..369eb5cc5a44b190fa23c4678eac7042db239e30 100644 (file)
--- a/Modules/_functoolsmodule.c
+++ b/Modules/_functoolsmodule.c
@@ -206,7 +206,7 @@ static PyTypeObject partial_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/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c
index c6817fe6651d33c3ed26e35732241e42a848239f..de453ac02f02a052e276cbcbe99fb8b8c9c84ef0 100644 (file)
--- a/Modules/_gdbmmodule.c
+++ b/Modules/_gdbmmodule.c
@@ -390,7 +390,7 @@ static PyTypeObject Dbmtype = {
     0,                                  /*tp_print*/
     0,                                  /*tp_getattr*/
     0,                                  /*tp_setattr*/
-    0,                                  /*tp_compare*/
+    0,                                  /*tp_reserved*/
     0,                                  /*tp_repr*/
     0,                                  /*tp_as_number*/
     &dbm_as_sequence,                   /*tp_as_sequence*/

diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
index 2284c5c91c6d6f1c88e0bafaec3aea610abc74eb..bd15b0195508c7cdb3e6f89c9ae3483c60baa43a 100644 (file)
--- a/Modules/_hashopenssl.c
+++ b/Modules/_hashopenssl.c
@@ -407,7 +407,7 @@ static PyTypeObject EVPtype = {
     0,                  /*tp_print*/
     0,                  /*tp_getattr*/
     0,                  /*tp_setattr*/
-    0,                  /*tp_compare*/
+    0,                  /*tp_reserved*/
     (reprfunc)EVP_repr, /*tp_repr*/
     0,                  /*tp_as_number*/
     0,                  /*tp_as_sequence*/

diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c
index 8457de108c5a50dd2ab1fabaacee778f55e1345c..43cb9b12423fed1eac2e1b996c66efb505b02a88 100644 (file)
--- a/Modules/_lsprof.c
+++ b/Modules/_lsprof.c
@@ -820,7 +820,7 @@ static PyTypeObject PyProfiler_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/Modules/_multiprocessing/connection.h b/Modules/_multiprocessing/connection.h
index 105d59c31bd2b816420bf09e708127a006bbb1c9..581beacf9f6aa6bf242012e43dbb9913911f569f 100644 (file)
--- a/Modules/_multiprocessing/connection.h
+++ b/Modules/_multiprocessing/connection.h
@@ -487,7 +487,7 @@ PyTypeObject CONNECTION_TYPE = {
        /* tp_print          */ 0,
        /* tp_getattr        */ 0,
        /* tp_setattr        */ 0,
-       /* tp_compare        */ 0,
+       /* tp_reserved       */ 0,
        /* tp_repr           */ (reprfunc)connection_repr,
        /* tp_as_number      */ 0,
        /* tp_as_sequence    */ 0,

diff --git a/Modules/_multiprocessing/semaphore.c b/Modules/_multiprocessing/semaphore.c
index a5ba71e30ca8f701d138094a93b44b21f7624107..9c8c445eb6f46536f8ee199aae397666b126c7a0 100644 (file)
--- a/Modules/_multiprocessing/semaphore.c
+++ b/Modules/_multiprocessing/semaphore.c
@@ -592,7 +592,7 @@ PyTypeObject SemLockType = {
        /* 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    */ 0,

diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 1036367aae11c7cf6375263ab1fd380e0b4fa25d..4976cc5d5c1f425047f1871de8411452f3c3e43d 100644 (file)
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -2677,7 +2677,7 @@ static PyTypeObject Pickler_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*/
@@ -4534,7 +4534,7 @@ static PyTypeObject Unpickler_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/Modules/_randommodule.c b/Modules/_randommodule.c
index 4cdd98da4da85c12d6a4764fdd21c3906166755c..2718b6942ca0e510f80ec48856d84665cd808e0f 100644 (file)
--- a/Modules/_randommodule.c
+++ b/Modules/_randommodule.c
@@ -459,7 +459,7 @@ static PyTypeObject Random_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/Modules/_sqlite/cache.c b/Modules/_sqlite/cache.c
index ed53958e9fb0a68bff18e9129344a41c021f49cc..7ac043cae13db44629cb65c4b015ebec058b0a4d 100644 (file)
--- a/Modules/_sqlite/cache.c
+++ b/Modules/_sqlite/cache.c
@@ -282,7 +282,7 @@ PyTypeObject pysqlite_NodeType = {
         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 */
@@ -324,7 +324,7 @@ PyTypeObject pysqlite_CacheType = {
         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/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 7fa69e783a142996818198756211d3d16621a15d..f7955232866cf8e6a5776ce574d759bed05726f7 100644 (file)
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -1350,7 +1350,7 @@ PyTypeObject pysqlite_ConnectionType = {
         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/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index f33abe4d2538b4e6ed398ee95286650b13611e79..7ce6cc5cac559466544f3095edba47c8b475cd0f 100644 (file)
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -1066,7 +1066,7 @@ PyTypeObject pysqlite_CursorType = {
         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/Modules/_sqlite/prepare_protocol.c b/Modules/_sqlite/prepare_protocol.c
index c018c965bb2b873c999c226add65166d20c8e107..96b1dca1843cbb634cae9873a9b25008e7404cff 100644 (file)
--- a/Modules/_sqlite/prepare_protocol.c
+++ b/Modules/_sqlite/prepare_protocol.c
@@ -42,7 +42,7 @@ PyTypeObject pysqlite_PrepareProtocolType= {
         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/Modules/_sqlite/row.c b/Modules/_sqlite/row.c
index d357efac84256803a851f25f1502735ff5bb40da..f9f57e9ffb041f17cd0815385b4c2f39ef44b253 100644 (file)
--- a/Modules/_sqlite/row.c
+++ b/Modules/_sqlite/row.c
@@ -210,7 +210,7 @@ PyTypeObject pysqlite_RowType = {
         (printfunc)pysqlite_row_print,                  /* 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/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c
index f1c0e7ca7a9a72a321148ae08090cbcf442393f9..fc2b4c4ce1632dfb42fd9eba417dad60ae055548 100644 (file)
--- a/Modules/_sqlite/statement.c
+++ b/Modules/_sqlite/statement.c
@@ -464,7 +464,7 @@ PyTypeObject pysqlite_StatementType = {
         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/Modules/_sre.c b/Modules/_sre.c
index 823dc5050924c9638294500d60914ea54f2caaaf..45b92f319d6c5f94ce7ae5bfa1dab45854a313aa 100644 (file)
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -2625,7 +2625,7 @@ static PyTypeObject Pattern_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 */
@@ -3635,7 +3635,7 @@ static PyTypeObject Match_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 */
@@ -3819,7 +3819,7 @@ static PyTypeObject Scanner_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/Modules/_ssl.c b/Modules/_ssl.c
index f143ae983f4fdb5736a6008f475c106b37c9e30d..37a14b12ea7aa40db03d95c772944be82e9cf252 100644 (file)
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -1432,7 +1432,7 @@ static PyTypeObject PySSL_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/Modules/_stringio.c b/Modules/_stringio.c
index f342048d5daf5f3621c5656c699a7b5960010da1..e627258b1ce9cead7615979b0a62b4c003498048 100644 (file)
--- a/Modules/_stringio.c
+++ b/Modules/_stringio.c
@@ -322,7 +322,7 @@ static PyTypeObject StringIO_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/Modules/_struct.c b/Modules/_struct.c
index 25144de98cb8498c1734902ff599117d7b2d585c..94cb303679e6712b55e39ebcb3a949c810ded011 100644 (file)
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -1853,7 +1853,7 @@ PyTypeObject PyStructType = {
        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/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index d3527db796d943cf72b99462308f3ddd6572a2ed..438d5a2a4497d416941d94a17fc823cffbc74a2c 100644 (file)
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -187,7 +187,7 @@ static PyTypeObject _HashInheritanceTester_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 */
@@ -1322,7 +1322,7 @@ static PyTypeObject test_structmembersType = {
        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/Modules/_threadmodule.c b/Modules/_threadmodule.c
index f0d03d74362c4ea6568ace9890adb48af04e0212..a0319985deadc8da2c8c19b4c51ef8afdc84d386 100644 (file)
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -129,7 +129,7 @@ static PyTypeObject Locktype = {
        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*/
@@ -358,7 +358,7 @@ static PyTypeObject localtype = {
        /* 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    */ 0,

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 01d1069361ca762ae121b8479844f6a66bea4668..81ec6a06899efee373d6f7d47ee7831b4120f0a5 100644 (file)
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -869,7 +869,7 @@ static PyTypeObject PyTclObject_Type = {
        0,                              /*tp_print*/
        0,                              /*tp_getattr*/
        0,                              /*tp_setattr*/
-       0,                              /*tp_compare*/
+       0,                              /*tp_reserved*/
        (reprfunc)PyTclObject_repr,     /*tp_repr*/
        0,                              /*tp_as_number*/
        0,                              /*tp_as_sequence*/
@@ -2351,7 +2351,7 @@ static PyTypeObject Tktt_Type =
        0,                                   /*tp_print */
        0,                                   /*tp_getattr */
        0,                                   /*tp_setattr */
-       0,                                   /*tp_compare */
+       0,                                   /*tp_reserved */
        Tktt_Repr,                           /*tp_repr */
        0,                                   /*tp_as_number */
        0,                                   /*tp_as_sequence */
@@ -2677,7 +2677,7 @@ static PyTypeObject Tkapp_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/Modules/arraymodule.c b/Modules/arraymodule.c
index c8b40bd00a35b2e6117abb6d5bbd30dc205f87cc..690c4881e08bf69bc2a354b839fc0768838dbd36 100644 (file)
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -2013,7 +2013,7 @@ static PyTypeObject Arraytype = {
        0,                                      /* tp_print */
        0,                                      /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        (reprfunc)array_repr,                   /* tp_repr */
        0,                                      /* tp_as_number*/
        &array_as_sequence,                     /* tp_as_sequence*/
@@ -2116,7 +2116,7 @@ static PyTypeObject PyArrayIter_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/Modules/bz2module.c b/Modules/bz2module.c
index c7cc7671bb1bc89d2dfbda3110eccc0e40b3aa7e..5f1d01b7751a5bbccf6a4f94bf06645c3e426b5e 100644 (file)
--- a/Modules/bz2module.c
+++ b/Modules/bz2module.c
@@ -1339,7 +1339,7 @@ static PyTypeObject BZ2File_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*/
@@ -1622,7 +1622,7 @@ static PyTypeObject BZ2Comp_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*/
@@ -1851,7 +1851,7 @@ static PyTypeObject BZ2Decomp_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/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index 82dfd49c74f5a488e33930ae5a3fd9b9eb47c096..9846465edc69b3425fca8eccc6b0c57d4e334ab0 100644 (file)
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -705,7 +705,7 @@ static PyTypeObject MultibyteCodec_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 */
@@ -990,7 +990,7 @@ static PyTypeObject MultibyteIncrementalEncoder_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 */
@@ -1199,7 +1199,7 @@ static PyTypeObject MultibyteIncrementalDecoder_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 */
@@ -1529,7 +1529,7 @@ static PyTypeObject MultibyteStreamReader_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 */
@@ -1749,7 +1749,7 @@ static PyTypeObject MultibyteStreamWriter_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/Modules/datetimemodule.c b/Modules/datetimemodule.c
index 98ae2bd2244f552c9c93883f0121a7c4c1146c42..0c6e66444c1a4427a5cb9742ba25e2761bbbadf3 100644 (file)
--- a/Modules/datetimemodule.c
+++ b/Modules/datetimemodule.c
@@ -1427,7 +1427,7 @@ build_struct_time(int y, int m, int d, int hh, int mm, int ss, int dstflag)
  * Miscellaneous helpers.
  */
 
-/* For various reasons, we need to use tp_richcompare instead of tp_compare.
+/* For various reasons, we need to use tp_richcompare instead of tp_reserved.
  * The comparisons here all most naturally compute a cmp()-like result.
  * This little helper turns that into a bool result for rich comparisons.
  */
@@ -2138,7 +2138,7 @@ static PyTypeObject PyDateTime_DeltaType = {
        0,                                              /* tp_print */
        0,                                              /* tp_getattr */
        0,                                              /* tp_setattr */
-       0,                                              /* tp_compare */
+       0,                                              /* tp_reserved */
        (reprfunc)delta_repr,                           /* tp_repr */
        &delta_as_number,                               /* tp_as_number */
        0,                                              /* tp_as_sequence */
@@ -2709,7 +2709,7 @@ static PyTypeObject PyDateTime_DateType = {
        0,                                              /* tp_print */
        0,                                              /* tp_getattr */
        0,                                              /* tp_setattr */
-       0,                                              /* tp_compare */
+       0,                                              /* tp_reserved */
        (reprfunc)date_repr,                            /* tp_repr */
        &date_as_number,                                /* tp_as_number */
        0,                                              /* tp_as_sequence */
@@ -2963,7 +2963,7 @@ static PyTypeObject PyDateTime_TZInfoType = {
        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 */
@@ -3478,7 +3478,7 @@ static PyTypeObject PyDateTime_TimeType = {
        0,                                      /* tp_print */
        0,                                      /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        (reprfunc)time_repr,                    /* tp_repr */
        &time_as_number,                        /* tp_as_number */
        0,                                      /* tp_as_sequence */
@@ -4606,7 +4606,7 @@ static PyTypeObject PyDateTime_DateTimeType = {
        0,                                      /* tp_print */
        0,                                      /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        (reprfunc)datetime_repr,                /* tp_repr */
        &datetime_as_number,                    /* tp_as_number */
        0,                                      /* tp_as_sequence */

diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
index ac3941dbef1fd569b3f1f16896805d2a1d5730ce..58c30f930d9450ca3e20f16e0635091970930395 100644 (file)
--- a/Modules/itertoolsmodule.c
+++ b/Modules/itertoolsmodule.c
@@ -148,7 +148,7 @@ static PyTypeObject groupby_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 */
@@ -279,7 +279,7 @@ static PyTypeObject _grouper_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 */
@@ -432,7 +432,7 @@ static PyTypeObject teedataobject_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 */
@@ -588,7 +588,7 @@ static PyTypeObject tee_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 */
@@ -783,7 +783,7 @@ static PyTypeObject cycle_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 */
@@ -925,7 +925,7 @@ static PyTypeObject dropwhile_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 */
@@ -1064,7 +1064,7 @@ static PyTypeObject takewhile_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 */
@@ -1257,7 +1257,7 @@ static PyTypeObject islice_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 */
@@ -1388,7 +1388,7 @@ static PyTypeObject starmap_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 */
@@ -1556,7 +1556,7 @@ static PyTypeObject chain_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 */
@@ -1804,7 +1804,7 @@ static PyTypeObject product_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 */
@@ -2027,7 +2027,7 @@ static PyTypeObject combinations_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 */
@@ -2273,7 +2273,7 @@ static PyTypeObject cwr_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 */
@@ -2544,7 +2544,7 @@ static PyTypeObject permutations_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 */
@@ -2700,7 +2700,7 @@ static PyTypeObject compress_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 */
@@ -2843,7 +2843,7 @@ static PyTypeObject filterfalse_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 */
@@ -2994,7 +2994,7 @@ static PyTypeObject count_type = {
        0,                              /* tp_print */
        0,                              /* tp_getattr */
        0,                              /* tp_setattr */
-       0,                              /* tp_compare */
+       0,                              /* tp_reserved */
        (reprfunc)count_repr,           /* tp_repr */
        0,                              /* tp_as_number */
        0,                              /* tp_as_sequence */
@@ -3129,7 +3129,7 @@ static PyTypeObject repeat_type = {
        0,                              /* tp_print */
        0,                              /* tp_getattr */
        0,                              /* tp_setattr */
-       0,                              /* tp_compare */
+       0,                              /* tp_reserved */
        (reprfunc)repeat_repr,          /* tp_repr */
        0,                              /* tp_as_number */
        0,                              /* tp_as_sequence */
@@ -3355,7 +3355,7 @@ static PyTypeObject ziplongest_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/Modules/md5module.c b/Modules/md5module.c
index 0f3c6d9449cd127ed6865091abbae57376d5f95d..3d54131dec5a8429dc99513875fa3da0c349083e 100644 (file)
--- a/Modules/md5module.c
+++ b/Modules/md5module.c
@@ -476,7 +476,7 @@ static PyTypeObject MD5type = {
     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/Modules/mmapmodule.c b/Modules/mmapmodule.c
index 6a2ebfd45da7549054d4449eda448368e0f0f810..034bd2262d4e676b6f8e2b6b96ea74532d04fb6e 100644 (file)
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -930,7 +930,7 @@ static PyTypeObject mmap_object_type = {
        0,                                      /* tp_print */
        0,                                      /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        0,                                      /* tp_repr */
        0,                                      /* tp_as_number */
        &mmap_as_sequence,                      /*tp_as_sequence*/

diff --git a/Modules/operator.c b/Modules/operator.c
index 9a1efb26d93650fb0dfa0279ba7c7c5cd1f626d2..0ba8b09941f18c07b69cd52835dd5be9bb2a703e 100644 (file)
--- a/Modules/operator.c
+++ b/Modules/operator.c
@@ -334,7 +334,7 @@ static PyTypeObject itemgetter_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 */
@@ -508,7 +508,7 @@ static PyTypeObject attrgetter_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 */
@@ -639,7 +639,7 @@ static PyTypeObject methodcaller_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/Modules/ossaudiodev.c b/Modules/ossaudiodev.c
index 677f9ac0c799b6a9ec627afb92586dd7991f1394..7686902bb57a1206172c0d911c7686a048083b2a 100644 (file)
--- a/Modules/ossaudiodev.c
+++ b/Modules/ossaudiodev.c
@@ -849,7 +849,7 @@ static PyTypeObject OSSAudioType = {
     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*/
@@ -881,7 +881,7 @@ static PyTypeObject OSSMixerType = {
     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/Modules/parsermodule.c b/Modules/parsermodule.c
index 32de6bc943c34a3675ffa64d1e7a948d3b633022..38ec65ee85e89f0e468815a1a4bfbdecb3b66546 100644 (file)
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -203,7 +203,7 @@ PyTypeObject PyST_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/Modules/pyexpat.c b/Modules/pyexpat.c
index ce72885f58266f190436d68dd7194dd80724c6c1..a968e524311afaa3060cc602d16ec3135971f97e 100644 (file)
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1622,7 +1622,7 @@ static PyTypeObject Xmlparsetype = {
        (printfunc)0,           /*tp_print*/
        0,                      /*tp_getattr*/
        (setattrfunc)xmlparse_setattr,  /*tp_setattr*/
-       0,                      /*tp_compare*/
+       0,                      /*tp_reserved*/
        (reprfunc)0,            /*tp_repr*/
        0,                      /*tp_as_number*/
        0,              /*tp_as_sequence*/

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index bd42e12196ee385d4086fca519ea9dac8c3943c2..191296e0d9e9810df7683d599a8941f196eac577 100644 (file)
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -639,7 +639,7 @@ static PyTypeObject poll_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*/
@@ -1097,7 +1097,7 @@ static PyTypeObject pyEpoll_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 */
@@ -1310,7 +1310,7 @@ static PyTypeObject kqueue_event_Type = {
        0,                                              /* tp_print */
        0,                                              /* tp_getattr */
        0,                                              /* tp_setattr */
-       0,                                              /* tp_compare */
+       0,                                              /* tp_reserved */
        (reprfunc)kqueue_event_repr,                    /* tp_repr */
        0,                                              /* tp_as_number */
        0,                                              /* tp_as_sequence */
@@ -1665,7 +1665,7 @@ static PyTypeObject kqueue_queue_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/Modules/sha1module.c b/Modules/sha1module.c
index 7d97e4f9aea25c29c01b25f05a79d9fe0c6c5a87..4d8ed1db9da87f20ae95f1e84d18f37fd5bb1f52 100644 (file)
--- a/Modules/sha1module.c
+++ b/Modules/sha1module.c
@@ -452,7 +452,7 @@ static PyTypeObject SHA1type = {
     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/Modules/sha256module.c b/Modules/sha256module.c
index 9cecd3a09fcdf6cab6a3d9512afe136884dbc99d..523f528876a96120d173a7d5e67290be5d885d37 100644 (file)
--- a/Modules/sha256module.c
+++ b/Modules/sha256module.c
@@ -545,7 +545,7 @@ static PyTypeObject SHA224type = {
     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*/
@@ -579,7 +579,7 @@ static PyTypeObject SHA256type = {
     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/Modules/sha512module.c b/Modules/sha512module.c
index 472b15808015819791b798038d416ef416c84c17..7d67a23b79805d94147a98d0aa9267da3e97e55a 100644 (file)
--- a/Modules/sha512module.c
+++ b/Modules/sha512module.c
@@ -611,7 +611,7 @@ static PyTypeObject SHA384type = {
     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*/
@@ -645,7 +645,7 @@ static PyTypeObject SHA512type = {
     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/Modules/socketmodule.c b/Modules/socketmodule.c
index b7b9a649af0163e643ba12bcdcf319a2d75205dd..a302dc5fa3a94e3fed2884179df9b714d5e2bf39 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -2860,7 +2860,7 @@ static PyTypeObject sock_type = {
        0,                                      /* tp_print */
        0,                                      /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        (reprfunc)sock_repr,                    /* tp_repr */
        0,                                      /* tp_as_number */
        0,                                      /* tp_as_sequence */

diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
index 12bda093f7369a8803327f650049d1fd82791d32..ba6d0b1a3a64613884d84df21e1038b1fa567544 100644 (file)
--- a/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@ -1144,7 +1144,7 @@ static PyTypeObject UCD_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/Modules/xxmodule.c b/Modules/xxmodule.c
index 602cdfe5ca6a210fe763a74620b1c02825d0c0ea..a31341c146f75e5fe045bdea2b0e59d7a453616a 100644 (file)
--- a/Modules/xxmodule.c
+++ b/Modules/xxmodule.c
@@ -106,7 +106,7 @@ static PyTypeObject Xxo_Type = {
        0,                      /*tp_print*/
        (getattrfunc)0,         /*tp_getattr*/
        (setattrfunc)Xxo_setattr, /*tp_setattr*/
-       0,                      /*tp_compare*/
+       0,                      /*tp_reserved*/
        0,                      /*tp_repr*/
        0,                      /*tp_as_number*/
        0,                      /*tp_as_sequence*/
@@ -224,7 +224,7 @@ static PyTypeObject Str_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*/
@@ -279,7 +279,7 @@ static PyTypeObject Null_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/Modules/xxsubtype.c b/Modules/xxsubtype.c
index 7f33c835bb6a0c5b46dca2ac61f8cef932685ee1..91ba0f1204b35663c46faa5bac15044eabebac58 100644 (file)
--- a/Modules/xxsubtype.c
+++ b/Modules/xxsubtype.c
@@ -109,7 +109,7 @@ static PyTypeObject spamlist_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 */
@@ -200,7 +200,7 @@ static PyTypeObject spamdict_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/Modules/zipimport.c b/Modules/zipimport.c
index ae11bdeeb4404b12c6f0346dbd83f0d16f0fd914..ba37f8b2d3e1258a9bb5e701ae9d5e6cfcfccd40 100644 (file)
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -597,7 +597,7 @@ static PyTypeObject ZipImporter_Type = {
        0,                                      /* tp_print */
        0,                                      /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        (reprfunc)zipimporter_repr,             /* tp_repr */
        0,                                      /* tp_as_number */
        0,                                      /* tp_as_sequence */

diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
index b924f847b91abb72107d1c1b37fcfa551144c4d4..6b818e54c8086ccfd9889f34b99e3f0e66f4cda6 100644 (file)
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -982,7 +982,7 @@ static PyTypeObject Comptype = {
     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*/
@@ -1013,7 +1013,7 @@ static PyTypeObject Decomptype = {
     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/boolobject.c b/Objects/boolobject.c
index eac31b994352e7f64da8602c156da5d73a5a2e5c..3d555430772c82d226568cded132faad8b49e148 100644 (file)
--- 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 1c524c1fa6d6b6fc01744ab3731347f3823252ba..9e93ddaf37c05380efab45c86eaa3b047488aca4 100644 (file)
--- 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 f9569a7b1fdaa12ae62817a9550d0be9846a0fbb..a4a2e65777f60849be1ef0d9d92f6453022e6c6a 100644 (file)
--- 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 c2194b717a10fb8402f79131f6e2936f0a59aff1..d7908de907de8de0843a46157acf132e187dacff 100644 (file)
--- 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 3c2bc3d0331022a61e1a0e2cd285f79ed74e11b8..d10ab298be4429aec7f2b0803ee06ac7028a55e2 100644 (file)
--- 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 c437491c27c26bc57aa60557b43abf0180bc8a84..e9b71df58c2641e70556f2347dd4cbf470b6444d 100644 (file)
--- 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 01a637aa6d006f7cdb31949bee39350a082e81fa..65868e450de713aeaea66d56b2405237edff0117 100644 (file)
--- 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 879d71c5652756602f7fc6041daa428c6f0460ac..207ecdd07fe967103c38cdcd0aa75bc9a9cafac9 100644 (file)
--- 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 a623925d093e6246c7aacf5134f6cce74f171783..cfd4b4fc7017851bb0613addf791c3c689c4d586 100644 (file)
--- 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 186846649f013a57504e876085f17da40e53f667..10b6fd856a560789a2bb139c9a2997a1d1df2c95 100644 (file)
--- 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 a76ba048ab4f827eba4069d1d6f10735da46c387..955bbdc6712773470955f4db4ddbdd235796a33a 100644 (file)
--- 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 2294500a7898644e8986bd688049ec1c746533c6..e5c6c7d086ab6ba682d6acb2db970e23da5ee5a8 100644 (file)
--- 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 16ce5424fcd61cd02ad5e7a4d21d6d2feb2966b4..85e87d701ffb4b2c90a2fad143fd43b35f6da076 100644 (file)
--- 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 a05b3c6a049d9ae14d42bba57460f652a2c6e1cd..e77b2dc855ef6c92d93ba675a0890bc7c6095dab 100644 (file)
--- 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 875c6deb8339bd27784fde90883fcdc6ee422a2d..52898ccb023373f66b0edd491c9af1f069d05971 100644 (file)
--- 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 594e524a81067bf638836399aca68aec11e0f476..1bb2092d66fd54fdf70f52c64dcf4dbc2794f047 100644 (file)
--- 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 72ddaefb3a465d880aa60837de5467802ce6760a..45f73d6bfe234000c9006902804d5c82d219b613 100644 (file)
--- 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 95ee56d039a8da891ccedbcef25241846f2f2b0f..174bd98642446d29cd6384d61c3b7def932e5138 100644 (file)
--- 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 40077a1b2b3686e733eb23638aab2b17b7ed727f..b8343631f441b8203a316815889ffa9fbee10cdb 100644 (file)
--- 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 5476e1978d76eb02866932ace174ca0e87861b98..e8d315def67fef43b52a50dd52e6c8dd18798283 100644 (file)
--- 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 0b65d443708a7aeb3809e99194436e1dfcd766e1..0f7d71d006aa580aa3b24c747dd63570385bde7d 100644 (file)
--- 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 cb6f1ba86acbb40d4d15cc10b55a8f9bfce92c77..b734b0fe5d843d2d9b5b8632458fd36c21328b85 100644 (file)
--- 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 0c6032fbe85941ee4aa60ee96d6638598abdb7d6..11dd43d23c83f7127b0f83be02d78b7427a3e553 100644 (file)
--- 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 49c985261588e9b9e4dcae6fd4a76bf1c5bf8e08..e134691559e34820546ede6ecef756fdc9765dd8 100644 (file)
--- 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 68f06a4f77f7c0fb708827d28644eb3a67b50678..01114bb6adb37fc765105ffc81663a95eab2924d 100644 (file)
--- 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 3dc396cf2e3e73d401585b01b79606950fac8dae..8ecc405bc5f0c2ee18ca9a8a0a150f599c3e67dc 100644 (file)
--- 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 fbf0955af49489c05c42fbd92692d89b32af0d60..ed3f520aa93a89ba945e9e31be1039e9663f5cd0 100644 (file)
--- 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 3f44e961e4268b46d938f9c91268289d0bc87b29..b8287701fa15a5d40216f9383d91ee2f6cb24c31 100644 (file)
--- 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 808f9383c2c5ad866b29a3cf4e979d196e08a202..54c8deb57f16e63e32e7bda5374754abd2984fa4 100644 (file)
--- 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 9da05ee274c6420954bd72b6f7c09e378ab64b86..f7b316b181b16cd57b56f2969595b95f4c538344 100644 (file)
--- 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 59890d26987a8b814390d8706fa9d02a2c5726af..05c9ceb92ff5002f0808b8347a71e0ae866a6a03 100644 (file)
--- 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 262a7d01f73f9fa8a062e79e897410bf8f469da8..0db13b1e3b8f2ca6355c8c5955f2ef00f27cabee 100644 (file)
--- 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 aa655730e66b77795725e2721840450e42c5c31c..214dd95da75bc24345c3c3be73cc895e7dc0e37d 100644 (file)
--- 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 */

diff --git a/PC/_msi.c b/PC/_msi.c
index f129293bb2cf60dc4bc6d64441ad2b33f83feadb..0df239709c9ca013e4da959a295f95bd5ce27bc5 100644 (file)
--- a/PC/_msi.c
+++ b/PC/_msi.c
@@ -473,7 +473,7 @@ static PyTypeObject record_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*/
@@ -643,7 +643,7 @@ static PyTypeObject summary_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*/
@@ -791,7 +791,7 @@ static PyTypeObject msiview_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*/
@@ -908,7 +908,7 @@ static PyTypeObject msidb_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/PC/_subprocess.c b/PC/_subprocess.c
index 8c9a3527c7a3b50953f2d6faa7ec882d44404d2f..99cbd24459d1783d8a9d8fe469bc8e1e7006799f 100644 (file)
--- a/PC/_subprocess.c
+++ b/PC/_subprocess.c
@@ -133,7 +133,7 @@ static PyTypeObject sp_handle_type = {
        0, /*tp_print*/
        0,                              /*tp_getattr*/
        0,                              /*tp_setattr*/
-       0,                              /*tp_compare*/
+       0,                              /*tp_reserved*/
        0,                              /*tp_repr*/
        &sp_handle_as_number,           /*tp_as_number */
        0,                              /*tp_as_sequence */

diff --git a/PC/winreg.c b/PC/winreg.c
index 8a4a2153ec05548a9fa8495d2256e1b18100abb4..7e8ea100f30166f9245d06b612d441c5f03cd356 100644 (file)
--- a/PC/winreg.c
+++ b/PC/winreg.c
@@ -485,7 +485,7 @@ PyTypeObject PyHKEY_Type =
        0,                              /* tp_print */
        0,                              /* tp_getattr */
        0,                              /* tp_setattr */
-       0,                              /* tp_compare */
+       0,                              /* tp_reserved */
        0,                              /* tp_repr */
        &PyHKEY_NumberMethods,          /* tp_as_number */
        0,                              /* tp_as_sequence */

diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index b98da20476316f1b4f28e42c5440bc623e24de30..af0b349b495c85d08c2ad49888f0ce86a1c327b3 100755 (executable)
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -662,7 +662,7 @@ static PyTypeObject AST_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/Python/Python-ast.c b/Python/Python-ast.c
index cf79b3789bc637ecaac153743c8c51990c811631..1e85b2fac7e011b0a2e492099bc0c7e33b7d3bc6 100644 (file)
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -479,7 +479,7 @@ static PyTypeObject AST_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/Python/bltinmodule.c b/Python/bltinmodule.c
index 8cb66c59665da2bf2fdf94658db4b627f0a72124..98056970a67847db4910d7960feda9c385f9a5cb 100644 (file)
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -416,7 +416,7 @@ PyTypeObject PyFilter_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 */
@@ -1017,7 +1017,7 @@ PyTypeObject PyMap_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 */
@@ -2166,7 +2166,7 @@ PyTypeObject PyZip_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/Python/import.c b/Python/import.c
index d741acae6b9666edc20a6947f6b313b76a2108bc..5a2c3cb038651a3a66192926e7112a217881ea4d 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -3295,7 +3295,7 @@ PyTypeObject PyNullImporter_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/Python/symtable.c b/Python/symtable.c
index e3bb2704804e18b30c68254289639173e4755046..17876ea0eb4d379af8b9f0378026fa2724fa6370 100644 (file)
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -130,7 +130,7 @@ PyTypeObject PySTEntry_Type = {
        0,                                      /* tp_print */
        0,                                     /* tp_getattr */
        0,                                      /* tp_setattr */
-       0,                                      /* tp_compare */
+       0,                                      /* tp_reserved */
        (reprfunc)ste_repr,                     /* tp_repr */
        0,                                      /* tp_as_number */
        0,                                      /* tp_as_sequence */

diff --git a/Python/traceback.c b/Python/traceback.c
index 42bbd538e23886404f79c0c65a3e75ee9c5f5da2..e77b1b282f20d391d938651eeb931a7116120d04 100644 (file)
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -72,7 +72,7 @@ PyTypeObject PyTraceBack_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*/