suggestions

python · WillAyd · Nov 6, 2022 · Nov 7, 2022 · Nov 7, 2022 · Nov 7, 2022
commit 0d2798e9d94f374499054a3b788e73ff26d22736
diff --git a/Misc/NEWS.d/next/Library/2022-11-06-19-59-56.gh-issue-86018.xAt6g2.rst b/Misc/NEWS.d/next/Library/2022-11-06-19-59-56.gh-issue-86018.xAt6g2.rst
@@ -1 +1 @@
-+ Fix issue where the error messages for :func:`json.dump` and :func:`json.dumps` were inconsistent when serializing non-finite values with ``allow_nan=False``
+ Fix issue where the error messages for :meth:`json.dump` and :meth:`json.dumps` were inconsistent when serializing non-finite values with ``allow_nan=False``
diff --git a/Modules/_json.c b/Modules/_json.c
@@ -1325,21 +1325,18 @@ encoder_encode_float(PyEncoderObject *s, PyObject *obj)
    double i = PyFloat_AS_DOUBLE(obj);
    if (!Py_IS_FINITE(i)) {
        char* value;
-        char *py_value;
        if (i > 0) {
          value = "Infinity";
-          py_value = "inf";
        } else if (i < 0) {
          value = "-Infinity";
-          py_value = "-inf";
        } else {
          value = "NaN";
-          py_value = "nan";
        }

        if (!s->allow_nan) {
-            char message[55] = "Out of range float values are not JSON compliant: ";
-            PyErr_SetString(PyExc_ValueError, strcat(message, py_value));
+            PyErr_Format(PyExc_ValueError,
+                           "Out of range float values are not JSON compliant: %S",
+                           obj);
            return NULL;
        } else {
          return PyUnicode_FromString(value);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		+ Fix issue where the error messages for :func:`json.dump` and :func:`json.dumps` were inconsistent when serializing non-finite values with ``allow_nan=False``
		+ Fix issue where the error messages for :meth:`json.dump` and :meth:`json.dumps` were inconsistent when serializing non-finite values with ``allow_nan=False``