]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-38540: Revert a warning if PY_SSIZE_T_CLEAN is not defined. (GH-16876)
authorSerhiy Storchaka <storchaka@gmail.com>
Mon, 21 Oct 2019 18:41:09 +0000 (21:41 +0300)
committerGitHub <noreply@github.com>
Mon, 21 Oct 2019 18:41:09 +0000 (21:41 +0300)
Python/getargs.c

index c3895d1d6c5945f0fd30b4a64893bfc4aca8662f..1c53361c5e6e181aef2505a61729a57831e9d463 100644 (file)
@@ -1176,19 +1176,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
                trailing 0-byte
 
             */
-            int *q = NULL; Py_ssize_t *q2 = NULL;
-            if (flags & FLAG_SIZE_T) {
-                q2 = va_arg(*p_va, Py_ssize_t*);
-            }
-            else {
-                if (PyErr_WarnEx(PyExc_DeprecationWarning,
-                            "PY_SSIZE_T_CLEAN will be required for '#' formats", 1))
-                {
-                    Py_DECREF(s);
-                    return NULL;
-                }
-                q = va_arg(*p_va, int*);
-            }
+            FETCH_SIZE;
 
             format++;
             if (q == NULL && q2 == NULL) {