commit 21161d73d979012ec3b7247261178b3aa1555486
author Raymond Hettinger <rhettinger@users.noreply.github.com> Sat Aug 24 19:45:12 2019 -0700
committer GitHub <noreply@github.com> Sat Aug 24 19:45:12 2019 -0700
tree 84103ff184fb812a7fcc366401418c6e0d6f0518
parent bf99801cf74347f0feaac2bf05842dcfa825963d

[3.8] bpo-37942: Improve argument clinic float converter (GH-15470) (GH-15480)

(cherry picked from commit aef9ad82f7f667cd001a7112d3bc636e918626f7)

Python/clinic/sysmodule.c.h

diff --git a/Python/clinic/sysmodule.c.h b/Python/clinic/sysmodule.c.h
index 6f248ff..563332e 100644
--- a/Python/clinic/sysmodule.c.h
+++ b/Python/clinic/sysmodule.c.h
@@ -362,9 +362,15 @@
     PyObject *return_value = NULL;
     double interval;
 
-    interval = PyFloat_AsDouble(arg);
-    if (PyErr_Occurred()) {
-        goto exit;
+    if (PyFloat_CheckExact(arg)) {
+        interval = PyFloat_AS_DOUBLE(arg);
+    }
+    else
+    {
+        interval = PyFloat_AsDouble(arg);
+        if (interval == -1.0 && PyErr_Occurred()) {
+            goto exit;
+        }
     }
     return_value = sys_setswitchinterval_impl(module, interval);
 
@@ -1082,4 +1088,4 @@
 #ifndef SYS_GETANDROIDAPILEVEL_METHODDEF
     #define SYS_GETANDROIDAPILEVEL_METHODDEF
 #endif /* !defined(SYS_GETANDROIDAPILEVEL_METHODDEF) */
-/*[clinic end generated code: output=43c4fde7b5783d8d input=a9049054013a1b77]*/
+/*[clinic end generated code: output=1a67b37c4486d65f input=a9049054013a1b77]*/

Python/getargs.c

diff --git a/Python/getargs.c b/Python/getargs.c
index 59f0fda..051ebc7 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -887,7 +887,7 @@
     case 'f': {/* float */
         float *p = va_arg(*p_va, float *);
         double dval = PyFloat_AsDouble(arg);
-        if (PyErr_Occurred())
+        if (dval == -1.0 && PyErr_Occurred())
             RETURN_ERR_OCCURRED;
         else
             *p = (float) dval;
@@ -897,7 +897,7 @@
     case 'd': {/* double */
         double *p = va_arg(*p_va, double *);
         double dval = PyFloat_AsDouble(arg);
-        if (PyErr_Occurred())
+        if (dval == -1.0 && PyErr_Occurred())
             RETURN_ERR_OCCURRED;
         else
             *p = dval;