From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 21 Oct 2019 18:41:09 +0000 (+0300)
Subject: bpo-38540: Revert a warning if PY_SSIZE_T_CLEAN is not defined. (GH-16876)
X-Git-Tag: v3.7.6rc1~91
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=928c68eee620cc6b624a195375143c2aa55644a4;p=thirdparty%2FPython%2Fcpython.git

bpo-38540: Revert a warning if PY_SSIZE_T_CLEAN is not defined. (GH-16876)
---

diff --git a/Python/getargs.c b/Python/getargs.c
index c3895d1d6c59..1c53361c5e6e 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -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) {