mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #8838, #8339: Remove codecs.charbuffer_encode() and "t#" parsing format

Browse source 
Remove last references to the "char buffer" of the buffer protocol from
Python3.
This commit is contained in:
Victor Stinner 2010-06-08 22:54:19 +00:00
parent 1fbd36b51d
commit 3dcb5acdb0
6 changed files with 11 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Python/getargs.c
View file

@ -864,7 +864,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
break;
}
/* XXX WAAAAH! 's', 'y', 'z', 'u', 'Z', 'e', 'w', 't' codes all
/* XXX WAAAAH! 's', 'y', 'z', 'u', 'Z', 'e', 'w' codes all
need to be cleaned up! */
case 's': {/* text string */
@ -1362,45 +1362,6 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
break;
}
/*TEO: This can be eliminated --- here only for backward
compatibility */
case 't': { /* 8-bit character buffer, read-only access */
char **p = va_arg(*p_va, char **);
PyBufferProcs *pb = arg->ob_type->tp_as_buffer;
Py_ssize_t count;
Py_buffer view;
if (*format++ != '#')
return converterr(
"invalid use of 't' format character",
arg, msgbuf, bufsize);
if (pb == NULL || pb->bf_getbuffer == NULL)
return converterr(
"bytes or read-only character buffer",
arg, msgbuf, bufsize);
if (PyObject_GetBuffer(arg, &view, PyBUF_SIMPLE) != 0)
return converterr("string or single-segment read-only buffer",
arg, msgbuf, bufsize);
count = view.len;
*p = view.buf;
if (pb->bf_releasebuffer)
return converterr(
"string or pinned buffer",
arg, msgbuf, bufsize);
PyBuffer_Release(&view);
if (count < 0)
return converterr("(unspecified)", arg, msgbuf, bufsize);
{
FETCH_SIZE;
STORE_SIZE(count);
}
break;
}
default:
return converterr("impossible<bad format char>", arg, msgbuf, bufsize);