Address Serhiy's review

python · vstinner · Dec 13, 2024 · Jul 2, 2024 · Jul 23, 2024 · Sep 3, 2024
commit 45517ab99a339763cc4ea8a6f997c68d023aeed3
diff --git a/Lib/test/test_capi/test_long.py b/Lib/test/test_capi/test_long.py
@@ -748,10 +748,9 @@ def test_long_export(self):
         self.assertEqual(pylong_export(IntSubclass(base**10 * 2 + 1)),
                          (0, [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2]))
 
-        for value in (1.0, 0+1j, "abc"):
-            with self.subTest(value=value):
-                with self.assertRaises(TypeError):
-                    pylong_export(value)
+        self.assertRaises(TypeError, pylong_export, 1.0)
+        self.assertRaises(TypeError, pylong_export, 0+1j)
+        self.assertRaises(TypeError, pylong_export, "abc")
 
     def test_longwriter_create(self):
         # Test PyLongWriter_Create()

diff --git a/Modules/_testcapi/long.c b/Modules/_testcapi/long.c
@@ -144,35 +144,11 @@ pylong_aspid(PyObject *module, PyObject *arg)
 static PyObject *
 layout_to_dict(const PyLongLayout *layout)
 {
-    PyObject *dict = PyDict_New();
-    if (dict == NULL) {
-        goto error;
-    }
-
-#define SET_DICT(KEY, EXPR) \
-    do { \
-        PyObject *value = (EXPR); \
-        if (value == NULL) { \
-            goto error; \
-        } \
-        int res = PyDict_SetItemString(dict, KEY, value); \
-        Py_DECREF(value); \
-        if (res < 0) { \
-            goto error; \
-        } \
-    } while (0)
-
-    SET_DICT("bits_per_digit", PyLong_FromUnsignedLong(layout->bits_per_digit));
-    SET_DICT("digit_size", PyLong_FromUnsignedLong(layout->digit_size));
-    SET_DICT("digits_order", PyLong_FromLong(layout->digits_order));
-    SET_DICT("digit_endianness", PyLong_FromLong(layout->digit_endianness));
-#undef SET_DICT
-
-    return dict;
-
-error:
-    Py_XDECREF(dict);
-    return NULL;
+    return Py_BuildValue("{sisisisi}",
+        "bits_per_digit", (int)layout->bits_per_digit,
+        "digit_size", (int)layout->digit_size,
+        "digits_order", (int)layout->digits_order,
+        "digit_endianness", (int)layout->digit_endianness);
 }
 
 
@@ -185,6 +161,9 @@ pylong_export(PyObject *module, PyObject *obj)
     }
 
     if (export_long.digits == NULL) {
+        assert(export_long.negative == 0);
+        assert(export_long.ndigits == 0);
+        assert(export_long.digits == NULL);
         return PyLong_FromInt64(export_long.value);
         // PyLong_FreeExport() is not needed in this case
     }
@@ -209,6 +188,7 @@ pylong_export(PyObject *module, PyObject *obj)
         Py_DECREF(item);
     }
 
+    assert(export_long.value == 0);
     PyObject *res = Py_BuildValue("(iN)", export_long.negative, digits);
 
     PyLong_FreeExport(&export_long);
@@ -228,6 +208,7 @@ pylongwriter_create(PyObject *module, PyObject *args)
 {
     int negative;
     PyObject *list;
+    // TODO(vstinner): write test for negative ndigits and digits==NULL
     if (!PyArg_ParseTuple(args, "iO!", &negative, &PyList_Type, &list)) {
         return NULL;
     }

diff --git a/Objects/longobject.c b/Objects/longobject.c
@@ -6817,7 +6817,7 @@ PyLong_Export(PyObject *obj, PyLongExport *export_long)
         export_long->value = value;
         export_long->negative = 0;
         export_long->ndigits = 0;
-        export_long->digits = 0;
+        export_long->digits = NULL;
         export_long->_reserved = 0;
     }
     else {