Merge branch 'master' into disable-wchar-cache

python · serhiy-storchaka · Oct 26, 2018 · Mar 19, 2019 · Mar 19, 2019 · Mar 19, 2019
commit 6915ce35684811af73eef87abaab35867d40b405
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -1181,7 +1181,7 @@ resize_inplace(PyObject *unicode, Py_ssize_t length)
     }
     new_size = sizeof(wchar_t) * (length + 1);
     wchar_t *wstr =  _PyUnicode_WSTR(unicode);
-    wstr = PyObject_REALLOC(wstr, new_size);
+    wstr = PyObject_Realloc(wstr, new_size);
     if (!wstr) {
         PyErr_NoMemory();
         return -1;
@@ -15595,7 +15595,7 @@ unicode_new_impl(PyTypeObject *type, PyObject *x, const char *encoding,
 static PyObject *
 unicode_subtype_new(PyTypeObject *type, PyObject *unicode)
 {
-    PyObject *unicode, *self;
+    PyObject *self;
     Py_ssize_t length;
     int share_utf8;
     unsigned int kind;

diff --git a/Python/getargs.c b/Python/getargs.c
@@ -1015,7 +1015,10 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
     case 'Z': /* raw unicode buffer or None */
     {
 #if HAVE_UNICODE_WCHAR_CACHE
-        // TODO: Raise DeprecationWarning
+        if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
+                "getargs: The '%c' format is deprecated. Use 'U' instead.", c)) {
+            return NULL;
+        }
 _Py_COMP_DIAG_PUSH
 _Py_COMP_DIAG_IGNORE_DEPR_DECLS
         Py_UNICODE **p = va_arg(*p_va, Py_UNICODE **);