commit aef9ad82f7f667cd001a7112d3bc636e918626f7
author Raymond Hettinger <rhettinger@users.noreply.github.com> Sat Aug 24 19:10:39 2019 -0700
committer GitHub <noreply@github.com> Sat Aug 24 19:10:39 2019 -0700
tree 71bc842de3236a77c6084e951ecf6061693705c0
parent 805f8f9afea116c5d4d000570e3d02ae84502f43

bpo-37942: Improve argument clinic float converter (GH-15470)

Python/clinic/sysmodule.c.h

diff --git a/Python/clinic/sysmodule.c.h b/Python/clinic/sysmodule.c.h
index 1f09e02..2f3bd14 100644
--- a/Python/clinic/sysmodule.c.h
+++ b/Python/clinic/sysmodule.c.h
@@ -306,9 +306,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);
 
@@ -989,4 +995,4 @@
 #ifndef SYS_GETANDROIDAPILEVEL_METHODDEF
     #define SYS_GETANDROIDAPILEVEL_METHODDEF
 #endif /* !defined(SYS_GETANDROIDAPILEVEL_METHODDEF) */
-/*[clinic end generated code: output=acef77d2bb8f6da9 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=b26faa0abdd700da input=a9049054013a1b77]*/

Python/getargs.c

diff --git a/Python/getargs.c b/Python/getargs.c
index cdc16d4..fe6474c 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;