bpo-36974: further manual changes

jdemeyer · jdemeyer · commit 7bbc34b0e033 · 2019-05-29T20:53:08.000+02:00
diff --git a/Doc/c-api/type.rst b/Doc/c-api/type.rst
@@ -191,7 +191,7 @@ The following functions and structs are used to create
       * :c:member:`~PyTypeObject.tp_cache`
       * :c:member:`~PyTypeObject.tp_subclasses`
       * :c:member:`~PyTypeObject.tp_weaklist`
-      * :c:member:`~PyTypeObject.tp_vectorcall_offset`
+      * :c:member:`~PyTypeObject.tp_print`
       * :c:member:`~PyTypeObject.tp_weaklistoffset`
       * :c:member:`~PyTypeObject.tp_dictoffset`
       * :c:member:`~PyBufferProcs.bf_getbuffer`
diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst
@@ -49,7 +49,7 @@ Quick Reference
    +---------------------------------------------+-----------------------------------+-------------------+---+---+---+---+
    | :c:member:`~PyTypeObject.tp_dealloc`        | :c:type:`destructor`              |                   | X | X |   | X |
    +---------------------------------------------+-----------------------------------+-------------------+---+---+---+---+
-   | (:c:member:`~PyTypeObject.tp_vectorcall_offset`)        |                                                                       |
+   | (:c:member:`~PyTypeObject.tp_print`)        |                                                                       |
    +---------------------------------------------+-----------------------------------+-------------------+---+---+---+---+
    | (:c:member:`~PyTypeObject.tp_getattr`)      | :c:type:`getattrfunc`             | __getattribute__, |   |   |   | G |
    |                                             |                                   | __getattr__       |   |   |   |   |
@@ -675,7 +675,7 @@ and :c:type:`PyType_Type` effectively act as defaults.)
    This field is inherited by subtypes.
 
 
-.. c:member:: printfunc PyTypeObject.tp_vectorcall_offset
+.. c:member:: printfunc PyTypeObject.tp_print
 
    Reserved slot, formerly used for print formatting in Python 2.x.
 
@@ -721,7 +721,7 @@ and :c:type:`PyType_Type` effectively act as defaults.)
    protocols at the C-level.  See :ref:`async-structs` for details.
 
    .. versionadded:: 3.5
-      Formerly known as ``tp_as_async`` and ``tp_as_async``.
+      Formerly known as ``tp_compare`` and ``tp_reserved``.
 
    **Inheritance:**
 
@@ -2404,7 +2404,7 @@ with a more verbose initializer::
        sizeof(MyObject),               /* tp_basicsize */
        0,                              /* tp_itemsize */
        (destructor)myobj_dealloc,      /* tp_dealloc */
-       0,                              /* tp_vectorcall_offset */
+       0,                              /* tp_print */
        0,                              /* tp_getattr */
        0,                              /* tp_setattr */
        0,                              /* tp_as_async */
diff --git a/Doc/includes/typestruct.h b/Doc/includes/typestruct.h
@@ -6,11 +6,11 @@ typedef struct _typeobject {
     /* Methods to implement standard operations */
 
     destructor tp_dealloc;
-    printfunc tp_vectorcall_offset;
+    printfunc tp_print;
     getattrfunc tp_getattr;
     setattrfunc tp_setattr;
-    PyAsyncMethods *tp_as_async; /* formerly known as tp_as_async (Python 2)
-                                    or tp_as_async (Python 3) */
+    PyAsyncMethods *tp_as_async; /* formerly known as tp_compare (Python 2)
+                                    or tp_reserved (Python 3) */
     reprfunc tp_repr;
 
     /* Method suites for standard classes */
diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
@@ -2531,7 +2531,7 @@ Changes in the C API
   the future.
   (Contributed by Serhiy Storchaka in :issue:`20204`.)
 
-* As part of the :pep:`492` implementation, the ``tp_as_async`` slot of
+* As part of the :pep:`492` implementation, the ``tp_reserved`` slot of
   :c:type:`PyTypeObject` was replaced with a
   :c:member:`tp_as_async` slot.  Refer to :ref:`coro-objects` for
   new types, structures and functions.
diff --git a/Include/cpython/object.h b/Include/cpython/object.h
@@ -185,8 +185,8 @@ typedef struct _typeobject {
     Py_ssize_t tp_vectorcall_offset;
     getattrfunc tp_getattr;
     setattrfunc tp_setattr;
-    PyAsyncMethods *tp_as_async; /* formerly known as tp_as_async (Python 2)
-                                    or tp_as_async (Python 3) */
+    PyAsyncMethods *tp_as_async; /* formerly known as tp_compare (Python 2)
+                                    or tp_reserved (Python 3) */
     reprfunc tp_repr;
 
     /* Method suites for standard classes */
diff --git a/Lib/test/test_defaultdict.py b/Lib/test/test_defaultdict.py
@@ -77,7 +77,7 @@ def test_print(self):
         def foo(): return 42
         d2 = defaultdict(foo, {1: 2})
         # NOTE: We can't use tempfile.[Named]TemporaryFile since this
-        # code must exercise the tp_vectorcall_offset C code, which only gets
+        # code must exercise the tp_print C code, which only gets
         # invoked for *real* files.
         tfn = tempfile.mktemp()
         try:
@@ -161,7 +161,7 @@ def _factory(self):
             r"of sub\(\.\.\., \{\}\)>, \{\}\)")
 
         # NOTE: printing a subclass of a builtin type does not call its
-        # tp_vectorcall_offset slot. So this part is essentially the same test as above.
+        # tp_print slot. So this part is essentially the same test as above.
         tfn = tempfile.mktemp()
         try:
             f = open(tfn, "w+")
diff --git a/Misc/HISTORY b/Misc/HISTORY
@@ -15238,10 +15238,10 @@ Core and Builtins
 
 - Issue #5182: Removed memoryview.__str__.
 
-- Issue #1717: Removed builtin cmp() function, dropped tp_as_async
+- 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_as_async slot has been renamed
-  to tp_as_async, and is reserved for future usage.
+  the type definition cmpfunc.  The tp_compare slot has been renamed
+  to tp_reserved, and is reserved for future usage.
 
 - Issue #1242657: the __len__() and __length_hint__() calls in several tools
   were suppressing all exceptions.  These include list() and bytearray().
@@ -23981,7 +23981,7 @@ Build
 C API
 -----
 
-- The documentation for the tp_as_async slot is updated to require that
+- The documentation for the tp_compare slot is updated to require that
   the return value must be -1, 0, 1; an arbitrary number <0 or >0 is
   not correct.  This is not yet enforced but will be enforced in
   Python 2.3; even later, we may use -2 to indicate errors and +2 for
@@ -25419,7 +25419,7 @@ Core language, builtins, and interpreter
   which is guaranteed to have the type that provided the function) and
   an integer indicating the opcode, which can be Py_LT, Py_LE, Py_EQ,
   Py_NE, Py_GT, Py_GE (for <, <=, ==, !=, >, >=), and returns a Python
-  object, which may be NotImplemented (in which case the tp_as_async
+  object, which may be NotImplemented (in which case the tp_compare
   slot function is used as a fallback, if defined).
 
   Classes can overload individual comparison operators by defining one
diff --git a/Modules/_blake2/blake2b_impl.c b/Modules/_blake2/blake2b_impl.c
@@ -401,10 +401,10 @@ PyTypeObject PyBlake2_BLAKE2bType = {
     sizeof(BLAKE2bObject),    /* tp_basicsize       */
     0,                        /* tp_itemsize        */
     py_blake2b_dealloc,       /* tp_dealloc         */
-    0,                        /* tp_vectorcall_offset           */
+    0,                        /*tp_vectorcall_offset*/
     0,                        /* tp_getattr         */
     0,                        /* tp_setattr         */
-    0,                        /* tp_as_async         */
+    0,                        /* tp_as_async        */
     0,                        /* tp_repr            */
     0,                        /* tp_as_number       */
     0,                        /* tp_as_sequence     */
diff --git a/Modules/_blake2/blake2s_impl.c b/Modules/_blake2/blake2s_impl.c
@@ -401,10 +401,10 @@ PyTypeObject PyBlake2_BLAKE2sType = {
     sizeof(BLAKE2sObject),    /* tp_basicsize       */
     0,                        /* tp_itemsize        */
     py_blake2s_dealloc,       /* tp_dealloc         */
-    0,                        /* tp_vectorcall_offset           */
+    0,                        /*tp_vectorcall_offset*/
     0,                        /* tp_getattr         */
     0,                        /* tp_setattr         */
-    0,                        /* tp_as_async         */
+    0,                        /* tp_as_async        */
     0,                        /* tp_repr            */
     0,                        /* tp_as_number       */
     0,                        /* tp_as_sequence     */
diff --git a/Modules/_csv.c b/Modules/_csv.c
@@ -469,7 +469,7 @@ static PyTypeObject Dialect_Type = {
     0,                                      /* tp_itemsize */
     /*  methods  */
     (destructor)Dialect_dealloc,            /* tp_dealloc */
-    (printfunc)0,                           /* tp_vectorcall_offset */
+    0,                                      /* tp_vectorcall_offset */
     (getattrfunc)0,                         /* tp_getattr */
     (setattrfunc)0,                         /* tp_setattr */
     0,                                      /* tp_as_async */
@@ -902,10 +902,10 @@ static PyTypeObject Reader_Type = {
     0,                                      /*tp_itemsize*/
     /* methods */
     (destructor)Reader_dealloc,             /*tp_dealloc*/
-    (printfunc)0,                           /*tp_vectorcall_offset*/
+    0,                                      /*tp_vectorcall_offset*/
     (getattrfunc)0,                         /*tp_getattr*/
     (setattrfunc)0,                         /*tp_setattr*/
-    0,                                     /*tp_as_async*/
+    0,                                      /*tp_as_async*/
     (reprfunc)0,                            /*tp_repr*/
     0,                                      /*tp_as_number*/
     0,                                      /*tp_as_sequence*/
@@ -1332,7 +1332,7 @@ static PyTypeObject Writer_Type = {
     0,                                      /*tp_itemsize*/
     /* methods */
     (destructor)Writer_dealloc,             /*tp_dealloc*/
-    (printfunc)0,                           /*tp_vectorcall_offset*/
+    0,                                      /*tp_vectorcall_offset*/
     (getattrfunc)0,                         /*tp_getattr*/
     (setattrfunc)0,                         /*tp_setattr*/
     0,                                      /*tp_as_async*/
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
@@ -1704,8 +1704,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_as_async.
- * The comparisons here all most naturally compute a cmp()-like result.
+/* The comparisons here all most naturally compute a cmp()-like result.
  * This little helper turns that into a bool result for rich comparisons.
  */
 static PyObject *
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
@@ -2331,7 +2331,7 @@ PyTypeObject PyBufferedIOBase_Type = {
     0,                          /*tp_vectorcall_offset*/
     0,                          /*tp_getattr*/
     0,                          /*tp_setattr*/
-    0,                          /*tp_as_async */
+    0,                          /*tp_as_async*/
     0,                          /*tp_repr*/
     0,                          /*tp_as_number*/
     0,                          /*tp_as_sequence*/
@@ -2422,7 +2422,7 @@ PyTypeObject PyBufferedReader_Type = {
     0,                          /*tp_vectorcall_offset*/
     0,                          /*tp_getattr*/
     0,                          /*tp_setattr*/
-    0,                          /*tp_as_async */
+    0,                          /*tp_as_async*/
     (reprfunc)buffered_repr,    /*tp_repr*/
     0,                          /*tp_as_number*/
     0,                          /*tp_as_sequence*/
@@ -2508,7 +2508,7 @@ PyTypeObject PyBufferedWriter_Type = {
     0,                          /*tp_vectorcall_offset*/
     0,                          /*tp_getattr*/
     0,                          /*tp_setattr*/
-    0,                          /*tp_as_async */
+    0,                          /*tp_as_async*/
     (reprfunc)buffered_repr,    /*tp_repr*/
     0,                          /*tp_as_number*/
     0,                          /*tp_as_sequence*/
@@ -2585,7 +2585,7 @@ PyTypeObject PyBufferedRWPair_Type = {
     0,                          /*tp_vectorcall_offset*/
     0,                          /*tp_getattr*/
     0,                          /*tp_setattr*/
-    0,                          /*tp_as_async */
+    0,                          /*tp_as_async*/
     0,                          /*tp_repr*/
     0,                          /*tp_as_number*/
     0,                          /*tp_as_sequence*/
@@ -2679,7 +2679,7 @@ PyTypeObject PyBufferedRandom_Type = {
     0,                          /*tp_vectorcall_offset*/
     0,                          /*tp_getattr*/
     0,                          /*tp_setattr*/
-    0,                          /*tp_as_async */
+    0,                          /*tp_as_async*/
     (reprfunc)buffered_repr,    /*tp_repr*/
     0,                          /*tp_as_number*/
     0,                          /*tp_as_sequence*/
diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
@@ -844,7 +844,7 @@ PyTypeObject PyIOBase_Type = {
     0,                          /*tp_vectorcall_offset*/
     0,                          /*tp_getattr*/
     0,                          /*tp_setattr*/
-    0,                          /*tp_as_async */
+    0,                          /*tp_as_async*/
     0,                          /*tp_repr*/
     0,                          /*tp_as_number*/
     0,                          /*tp_as_sequence*/
@@ -1040,7 +1040,7 @@ PyTypeObject PyRawIOBase_Type = {
     0,                          /*tp_vectorcall_offset*/
     0,                          /*tp_getattr*/
     0,                          /*tp_setattr*/
-    0,                          /*tp_as_async */
+    0,                          /*tp_as_async*/
     0,                          /*tp_repr*/
     0,                          /*tp_as_number*/
     0,                          /*tp_as_sequence*/
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
@@ -172,7 +172,7 @@ PyTypeObject PyTextIOBase_Type = {
     0,                          /*tp_vectorcall_offset*/
     0,                          /*tp_getattr*/
     0,                          /*tp_setattr*/
-    0,                          /*tp_as_async */
+    0,                          /*tp_as_async*/
     0,                          /*tp_repr*/
     0,                          /*tp_as_number*/
     0,                          /*tp_as_sequence*/
@@ -3162,7 +3162,7 @@ PyTypeObject PyIncrementalNewlineDecoder_Type = {
     0,                          /*tp_vectorcall_offset*/
     0,                          /*tp_getattr*/
     0,                          /*tp_setattr*/
-    0,                          /*tp_as_async */
+    0,                          /*tp_as_async*/
     0,                          /*tp_repr*/
     0,                          /*tp_as_number*/
     0,                          /*tp_as_sequence*/
@@ -3246,7 +3246,7 @@ PyTypeObject PyTextIOWrapper_Type = {
     0,                          /*tp_vectorcall_offset*/
     0,                          /*tp_getattr*/
     0,                          /*tps_etattr*/
-    0,                          /*tp_as_async */
+    0,                          /*tp_as_async*/
     (reprfunc)textiowrapper_repr,/*tp_repr*/
     0,                          /*tp_as_number*/
     0,                          /*tp_as_sequence*/
diff --git a/Modules/_multiprocessing/semaphore.c b/Modules/_multiprocessing/semaphore.c
@@ -633,7 +633,7 @@ PyTypeObject _PyMp_SemLockType = {
     /* tp_basicsize      */ sizeof(SemLockObject),
     /* tp_itemsize       */ 0,
     /* tp_dealloc        */ (destructor)semlock_dealloc,
-    /* tp_vectorcall_offset          */ 0,
+    /* tp_vectorcall_offset */ 0,
     /* tp_getattr        */ 0,
     /* tp_setattr        */ 0,
     /* tp_as_async       */ 0,
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
@@ -609,7 +609,7 @@ static PyTypeObject localdummytype = {
     /* tp_basicsize      */ sizeof(localdummyobject),
     /* tp_itemsize       */ 0,
     /* tp_dealloc        */ (destructor)localdummy_dealloc,
-    /* tp_vectorcall_offset          */ 0,
+    /* tp_vectorcall_offset */ 0,
     /* tp_getattr        */ 0,
     /* tp_setattr        */ 0,
     /* tp_as_async       */ 0,
@@ -874,7 +874,7 @@ static PyTypeObject localtype = {
     /* tp_basicsize      */ sizeof(localobject),
     /* tp_itemsize       */ 0,
     /* tp_dealloc        */ (destructor)local_dealloc,
-    /* tp_vectorcall_offset          */ 0,
+    /* tp_vectorcall_offset */ 0,
     /* tp_getattr        */ 0,
     /* tp_setattr        */ 0,
     /* tp_as_async       */ 0,
diff --git a/Modules/_winapi.c b/Modules/_winapi.c
@@ -310,7 +310,7 @@ PyTypeObject OverlappedType = {
     /* tp_basicsize      */ sizeof(OverlappedObject),
     /* tp_itemsize       */ 0,
     /* tp_dealloc        */ (destructor) overlapped_dealloc,
-    /* tp_vectorcall_offset          */ 0,
+    /* tp_vectorcall_offset */ 0,
     /* tp_getattr        */ 0,
     /* tp_setattr        */ 0,
     /* tp_as_async       */ 0,
diff --git a/Modules/overlapped.c b/Modules/overlapped.c
@@ -1765,7 +1765,7 @@ PyTypeObject OverlappedType = {
     /* tp_basicsize      */ sizeof(OverlappedObject),
     /* tp_itemsize       */ 0,
     /* tp_dealloc        */ (destructor) Overlapped_dealloc,
-    /* tp_vectorcall_offset          */ 0,
+    /* tp_vectorcall_offset */ 0,
     /* tp_getattr        */ 0,
     /* tp_setattr        */ 0,
     /* tp_as_async       */ 0,
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
@@ -224,7 +224,7 @@ PyTypeObject PyST_Type = {
     (int) sizeof(PyST_Object),          /* tp_basicsize         */
     0,                                  /* tp_itemsize          */
     (destructor)parser_free,            /* tp_dealloc           */
-    0,                                  /* tp_vectorcall_offset             */
+    0,                                  /* tp_vectorcall_offset */
     0,                                  /* tp_getattr           */
     0,                                  /* tp_setattr           */
     0,                                  /* tp_as_async          */
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
@@ -1468,7 +1468,7 @@ static PyTypeObject Xmlparsetype = {
         0,                              /*tp_itemsize*/
         /* methods */
         (destructor)xmlparse_dealloc,   /*tp_dealloc*/
-        (printfunc)0,           /*tp_vectorcall_offset*/
+        0,                              /*tp_vectorcall_offset*/
         0,                      /*tp_getattr*/
         0,  /*tp_setattr*/
         0,                      /*tp_as_async*/
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
@@ -372,7 +372,7 @@ static PyTypeObject _PyExc_BaseException = {
     0,                          /*tp_vectorcall_offset*/
     0,                          /*tp_getattr*/
     0,                          /*tp_setattr*/
-    0,                          /* tp_as_async; */
+    0,                          /*tp_as_async*/
     (reprfunc)BaseException_repr, /*tp_repr*/
     0,                          /*tp_as_number*/
     0,                          /*tp_as_sequence*/
diff --git a/Objects/object.c b/Objects/object.c
@@ -669,7 +669,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_as_async slot has been renamed to tp_as_async, and should no
+   The old tp_compare slot has been renamed to tp_as_async, and should no
    longer be used.  Use tp_richcompare instead.
 
    See (*) below for practical amendments.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -5143,7 +5143,6 @@ inherit_slots(PyTypeObject *type, PyTypeObject *base)
         type->tp_setattr = base->tp_setattr;
         type->tp_setattro = base->tp_setattro;
     }
-    /* tp_as_async is ignored */
     COPYSLOT(tp_repr);
     /* tp_hash see tp_richcompare */
     COPYSLOT(tp_call);
diff --git a/Tools/scripts/abitype.py b/Tools/scripts/abitype.py
@@ -86,10 +86,10 @@ def get_fields(start, real_end):
     'tp_basicsize',
     'tp_itemsize',
     'tp_dealloc',
-    'tp_vectorcall_offset',
+    'tp_print',
     'tp_getattr',
     'tp_setattr',
-    'tp_as_async',
+    'tp_reserved',
     'tp_repr',
     'tp_as_number',
     'tp_as_sequence',
