+1

Author: skirpichev

Lib/test/test_array.py

@@ -14,7 +14,6 @@
 import operator
 import struct
 import sys
-import warnings
 
 import array
 from array import _array_reconstructor as array_reconstructor

Modules/arraymodule.c

@@ -292,49 +292,6 @@ BB_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
     return 0;
 }
 
-static PyObject *
-u_getitem(arrayobject *ap, Py_ssize_t i)
-{
-    return PyUnicode_FromOrdinal(((wchar_t *) ap->ob_item)[i]);
-}
-
-static int
-u_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
-{
-    if (!PyUnicode_Check(v)) {
-        PyErr_Format(PyExc_TypeError,
-                     "array item must be a unicode character, not %T",
-                     v);
-        return -1;
-    }
-
-    Py_ssize_t len = PyUnicode_AsWideChar(v, NULL, 0);
-    if (len != 2) {
-        if (PyUnicode_GET_LENGTH(v) != 1) {
-            PyErr_Format(PyExc_TypeError,
-                         "array item must be a unicode character, "
-                         "not a string of length %zd",
-                         PyUnicode_GET_LENGTH(v));
-        }
-        else {
-            PyErr_Format(PyExc_TypeError,
-                         "string %A cannot be converted to "
-                         "a single wchar_t character",
-                         v);
-        }
-        return -1;
-    }
-
-    wchar_t w;
-    len = PyUnicode_AsWideChar(v, &w, 1);
-    assert(len == 1);
-
-    if (i >= 0) {
-        ((wchar_t *)ap->ob_item)[i] = w;
-    }
-    return 0;
-}
-
 static PyObject *
 w_getitem(arrayobject *ap, Py_ssize_t i)
 {
@@ -750,7 +707,6 @@ cd_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
 
 DEFINE_COMPAREITEMS(b, signed char)
 DEFINE_COMPAREITEMS(BB, unsigned char)
-DEFINE_COMPAREITEMS(u, wchar_t)
 DEFINE_COMPAREITEMS(w, Py_UCS4)
 DEFINE_COMPAREITEMS(h, short)
 DEFINE_COMPAREITEMS(HH, unsigned short)