Mercurial > cpython-lru_cache-weakref
diff Python/modsupport.c @ 41611:c48fe4dc34a9
Change UnicodeDecodeError objects so that the 'object' attribute
is a bytes object.
Add 'y' and 'y#' format specifiers that work like 's' and 's#'
but only accept bytes objects.
| author | Walter Dörwald <walter@livinglogic.de> |
|---|---|
| date | Fri, 04 May 2007 19:28:21 +0000 |
| parents | 15b810e21fe9 |
| children | d6aa7edf217a |
line wrap: on
line diff
--- a/Python/modsupport.c Fri May 04 17:44:47 2007 +0000 +++ b/Python/modsupport.c Fri May 04 19:28:21 2007 +0000 @@ -424,6 +424,39 @@ return v; } + case 'y': + { + PyObject *v; + char *str = va_arg(*p_va, char *); + Py_ssize_t n; + if (**p_format == '#') { + ++*p_format; + if (flags & FLAG_SIZE_T) + n = va_arg(*p_va, Py_ssize_t); + else + n = va_arg(*p_va, int); + } + else + n = -1; + if (str == NULL) { + v = Py_None; + Py_INCREF(v); + } + else { + if (n < 0) { + size_t m = strlen(str); + if (m > PY_SSIZE_T_MAX) { + PyErr_SetString(PyExc_OverflowError, + "string too long for Python bytes"); + return NULL; + } + n = (Py_ssize_t)m; + } + v = PyBytes_FromStringAndSize(str, n); + } + return v; + } + case 'N': case 'S': case 'O':