Address review comments.

python · serhiy-storchaka · Feb 25, 2019 · Feb 20, 2019 · Feb 20, 2019 · Feb 22, 2019
commit 6f2a051a0f8785ccc1c7f7f9cb342cf84e1b7008
diff --git a/Doc/c-api/long.rst b/Doc/c-api/long.rst
@@ -281,9 +281,9 @@ distinguished from a number.  Use :c:func:`PyErr_Occurred` to disambiguate.
 .. c:function:: unsigned long PyLong_AsUnsignedLongMask(PyObject *obj)
 
    Return a C :c:type:`unsigned long` representation of *obj*.  If *obj*
-   instance of :c:type:`PyLongObject`, first call its :meth:`__index__` or
-   :meth:`__int__` method (if present) to convert it to a
-   :c:type:`PyLongObject`.
+   is not an instance of :c:type:`PyLongObject`, first call its
+   :meth:`__index__` or :meth:`__int__` method (if present) to convert
+   it to a :c:type:`PyLongObject`.
 
    If the value of *obj* is out of range for an :c:type:`unsigned long`,
    return the reduction of that value modulo ``ULONG_MAX + 1``.
@@ -300,9 +300,9 @@ distinguished from a number.  Use :c:func:`PyErr_Occurred` to disambiguate.
 .. c:function:: unsigned long long PyLong_AsUnsignedLongLongMask(PyObject *obj)
 
    Return a C :c:type:`unsigned long long` representation of *obj*.  If *obj*
-   instance of :c:type:`PyLongObject`, first call its :meth:`__index__` or
-   :meth:`__int__` method (if present) to convert it to a
-   :c:type:`PyLongObject`.
+   is not an instance of :c:type:`PyLongObject`, first call its
+   :meth:`__index__` or :meth:`__int__` method (if present) to convert
+   it to a :c:type:`PyLongObject`.
 
    If the value of *obj* is out of range for an :c:type:`unsigned long long`,
    return the reduction of that value modulo ``PY_ULLONG_MAX + 1``.

diff --git a/Include/longobject.h b/Include/longobject.h
@@ -181,7 +181,7 @@ PyAPI_FUNC(PyObject *) _PyLong_FromNbInt(PyObject *);
 
 /* Convert the given object to a PyLongObject using the nb_index or
    nb_int slots, if available (the latter is deprecated).
-   Raise TypeError if either the nb_index and nb_int slots are not
+   Raise TypeError if either nb_index and nb_int slots are not
    available or the result of the call to nb_index or nb_int
    returns something not of type int.
    Should be replaced with PyNumber_Index after the end of the

diff --git a/Lib/test/test_structmembers.py b/Lib/test/test_structmembers.py
@@ -106,14 +106,6 @@ def test_bad_assignments(self):
         for nonint in None, 3.2j, "full of eels", {}, []:
             for attr in integer_attributes:
                 self.assertRaises(TypeError, setattr, ts, attr, nonint)
-        #for nonint in 3.2j,:
-            #for attr in integer_attributes:
-                #if attr not in ('T_BOOL', 'T_PYSSIZET'):
-                  #with self.subTest(xx=attr):
-                    #with self.assertWarns(DeprecationWarning):
-                        #self.assertRaises(TypeError, setattr, ts, attr, nonint)
-            #for attr in ('T_BOOL', 'T_PYSSIZET'):
-                #self.assertRaises(TypeError, setattr, ts, attr, nonint)
 
     def test_inplace_string(self):
         self.assertEqual(ts.T_STRING_INPLACE, "hi")

diff --git a/Objects/longobject.c b/Objects/longobject.c
@@ -184,9 +184,14 @@ _PyLong_FromNbInt(PyObject *integral)
     return result;
 }
 
-
-/* XXX Should be replaces with PyNumber_Index after the end of the
-   deprecation period. */
+/* Convert the given object to a PyLongObject using the nb_index or
+   nb_int slots, if available (the latter is deprecated).
+   Raise TypeError if either nb_index and nb_int slots are not
+   available or the result of the call to nb_index or nb_int
+   returns something not of type int.
+   Should be replaced with PyNumber_Index after the end of the
+   deprecation period.
+*/
 PyObject *
 _PyLong_FromNbIndexOrNbInt(PyObject *integral)
 {

diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
@@ -2599,6 +2599,8 @@ def converter_init(self, *, accept={object}):
 
     def parse_arg(self, argname, argnum):
         if self.format_unit == 'i':
+            # XXX PyFloat_Check can be removed after the end of the
+            # deprecation in _PyLong_FromNbIndexOrNbInt.
             return """
                 if (PyFloat_Check({argname})) {{{{
                     PyErr_SetString(PyExc_TypeError,