Mercurial > cpython-lru_cache-weakref

diff Modules/arraymodule.c @ 43555:8e72dacf7f3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Eliminate use of PyBUF_CHARACTER flag which is no longer part of the buffer interface. Fix up array module to export the correct format for wide-builds.
author Travis E. Oliphant <oliphant@enthought.com>
date Sat, 13 Oct 2007 21:03:27 +0000
parents 644e28ea9b22
children b4035d3665bb
line wrap: on
line diff
--- a/Modules/arraymodule.c	Sat Oct 13 21:01:08 2007 +0000
+++ b/Modules/arraymodule.c	Sat Oct 13 21:03:27 2007 +0000
@@ -385,7 +385,7 @@
 static struct arraydescr descriptors[] = {
 	{'b', 1, b_getitem, b_setitem, "b"},
 	{'B', 1, BB_getitem, BB_setitem, "B"},
-	{'u', sizeof(Py_UNICODE), u_getitem, u_setitem, "U"},
+	{'u', sizeof(Py_UNICODE), u_getitem, u_setitem, "u"},
 	{'h', sizeof(short), h_getitem, h_setitem, "h"},
 	{'H', sizeof(short), HH_getitem, HH_setitem, "H"},
 	{'i', sizeof(int), i_getitem, i_setitem, "i"},
@@ -1784,11 +1784,6 @@
 static int
 array_buffer_getbuf(arrayobject *self, Py_buffer *view, int flags)
 {
-        if ((flags & PyBUF_CHARACTER)) {
-                PyErr_SetString(PyExc_TypeError,
-                                "Cannot be a character buffer");
-                return -1;
-        }
         if ((flags & PyBUF_LOCK)) {
                 PyErr_SetString(PyExc_BufferError,
                                 "Cannot lock data");
@@ -1815,6 +1810,11 @@
         view->internal = NULL;
         if ((flags & PyBUF_FORMAT) == PyBUF_FORMAT) {
                 view->format = self->ob_descr->formats;
+#ifdef Py_UNICODE_WIDE
+		if (self->ob_descr->typecode == 'u') {
+			view->formats = "w";
+		}
+#endif
         }
 
  finish: