diff options
| author | Travis E. Oliphant <oliphant@enthought.com> | 2007-10-13 21:03:27 (GMT) |
|---|---|---|
| committer | Travis E. Oliphant <oliphant@enthought.com> | 2007-10-13 21:03:27 (GMT) |
| commit | ddacf968682818a34a90ec6702fbb44098914a9d (patch) | |
| tree | f7f6ccb66009a525c1f8aa176626a8b95a516cef /Objects | |
| parent | d417a154e4fcae12fd17b160762eafe8eec6d3f5 (diff) | |
| download | cpython-ddacf968682818a34a90ec6702fbb44098914a9d.zip cpython-ddacf968682818a34a90ec6702fbb44098914a9d.tar.gz cpython-ddacf968682818a34a90ec6702fbb44098914a9d.tar.bz2 | |
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.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/abstract.c | 2 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index 3d736d1..e848f8f 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -236,7 +236,7 @@ PyObject_AsCharBuffer(PyObject *obj, "expected an object with the buffer interface"); return -1; } - if ((*pb->bf_getbuffer)(obj, &view, PyBUF_CHARACTER)) return -1; + if ((*pb->bf_getbuffer)(obj, &view, PyBUF_SIMPLE)) return -1; *buffer = view.buf; *buffer_len = view.len; diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index e622967..73aeec4 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -8117,10 +8117,6 @@ static int unicode_buffer_getbuffer(PyUnicodeObject *self, Py_buffer *view, int flags) { - if (flags & PyBUF_CHARACTER) { - PyErr_SetString(PyExc_SystemError, "can't use str as char buffer"); - return -1; - } return PyBuffer_FillInfo(view, (void *)self->str, PyUnicode_GET_DATA_SIZE(self), 1, flags); } |