Address some other review comments

numpy · charris · Jul 26, 2023 · Oct 20, 2020 · Oct 20, 2020 · Oct 20, 2020
commit a6645e08320c7269088345e0857f27f6eadec095
diff --git a/numpy/core/arrayprint.py b/numpy/core/arrayprint.py
@@ -1035,25 +1035,24 @@ def __call__(self, x):
                 return ' '*(self.pad_left + self.pad_right + 1 - len(ret)) + ret
 
         if self.exp_format:
-            res = dragon4_scientific(x,
-                                     precision=self.precision,
-                                     min_digits=self.min_digits,
-                                     unique=self.unique,
-                                         trim=self.trim,
-                                     sign=self.sign == '+',
-                                     pad_left=self.pad_left,
-                                     exp_digits=self.exp_size)
+            return dragon4_scientific(x,
+                                      precision=self.precision,
+                                      min_digits=self.min_digits,
+                                      unique=self.unique,
+                                      trim=self.trim,
+                                      sign=self.sign == '+',
+                                      pad_left=self.pad_left,
+                                      exp_digits=self.exp_size)
         else:
-            res = dragon4_positional(x,
-                                     precision=self.precision,
-                                     min_digits=self.min_digits,
-                                     unique=self.unique,
-                                     fractional=True,
-                                     trim=self.trim,
-                                     sign=self.sign == '+',
-                                     pad_left=self.pad_left,
-                                     pad_right=self.pad_right)
-        return res
+            return dragon4_positional(x,
+                                      precision=self.precision,
+                                      min_digits=self.min_digits,
+                                      unique=self.unique,
+                                      fractional=True,
+                                      trim=self.trim,
+                                      sign=self.sign == '+',
+                                      pad_left=self.pad_left,
+                                      pad_right=self.pad_right)
 
 
 @set_module('numpy')
@@ -1283,6 +1282,7 @@ def __call__(self, x):
 
         return r + i
 
+
 class _TimelikeFormat:
     def __init__(self, data):
         non_nat = data[~isnat(data)]
@@ -1408,7 +1408,7 @@ def __call__(self, x):
             return "({})".format(", ".join(str_fields))
 
 
-def _void_scalar_repr(x, is_repr=True):
+def _void_scalar_to_string(x, is_repr=True):
     """
     Implements the repr for structured-void scalars. It is called from the
     scalartypes.c.src code, and is placed here because it uses the elementwise

diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src
@@ -605,15 +605,15 @@ _void_to_hex(const char* argbuf, const Py_ssize_t arglen,
 }
 
 static PyObject *
-_void_scalar_repr(PyObject *obj, int repr) {
-    static PyObject *reprfunc = NULL;
+_void_scalar_to_string(PyObject *obj, int repr) {
+    static PyObject *tostring_func = NULL;
     npy_cache_import("numpy.core.arrayprint",
-                     "_void_scalar_repr", &reprfunc);
-    if (reprfunc == NULL) {
+                     "_void_scalar_to_string", &tostring_func);
+    if (tostring_func == NULL) {
         return NULL;
     }
     PyObject *is_repr = repr ? Py_True : Py_False;
-    return PyObject_CallFunction(reprfunc, "OO", obj, is_repr);
+    return PyObject_CallFunctionObjArgs(tostring_func, obj, is_repr, NULL);
 }
 
 static PyObject *
@@ -622,7 +622,7 @@ voidtype_repr(PyObject *self)
     PyVoidScalarObject *s = (PyVoidScalarObject*) self;
     if (PyDataType_HASFIELDS(s->descr)) {
         /* use string on old versions */
-        return _void_scalar_repr(self, npy_legacy_print_mode > 125);
+        return _void_scalar_to_string(self, npy_legacy_print_mode > 125);
     }
     if (npy_legacy_print_mode > 125) {
         return _void_to_hex(s->obval, s->descr->elsize, "np.void(b'", "\\x", "')");
@@ -637,7 +637,7 @@ voidtype_str(PyObject *self)
 {
     PyVoidScalarObject *s = (PyVoidScalarObject*) self;
     if (PyDataType_HASFIELDS(s->descr)) {
-        return _void_scalar_repr(self, 0);
+        return _void_scalar_to_string(self, 0);
     }
     return _void_to_hex(s->obval, s->descr->elsize, "b'", "\\x", "'");
 }