From 25871c001f55941fec83e7ce9832e5f45c69a8cf Mon Sep 17 00:00:00 2001 From: Fred Drake Date: Wed, 3 May 2000 15:17:02 +0000 Subject: Brian Hooper : Added 'u' and 'u#' tags for PyArg_ParseTuple - these turn a PyUnicodeObject argument into a Py_UNICODE * buffer, or a Py_UNICODE * buffer plus a length with the '#'. Also added an analog to 'U' for Py_BuildValue. --- Python/getargs.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'Python/getargs.c') diff --git a/Python/getargs.c b/Python/getargs.c index 1e88a8809a..0579aff14d 100644 --- a/Python/getargs.c +++ b/Python/getargs.c @@ -777,6 +777,38 @@ convertsimple1(arg, p_format, p_va) break; } + case 'u': /* raw unicode buffer (Py_UNICODE *) */ + { + if (*format == '#') { /* any buffer-like object */ + void **p = (void **)va_arg(*p_va, char **); + PyBufferProcs *pb = arg->ob_type->tp_as_buffer; + int *q = va_arg(*p_va, int *); + int count; + + if ( pb == NULL || + pb->bf_getreadbuffer == NULL || + pb->bf_getsegcount == NULL ) + return "read-only buffer"; + if ( (*pb->bf_getsegcount)(arg, NULL) != 1 ) + return "single-segment read-only buffer"; + if ( (count = + (*pb->bf_getreadbuffer)(arg, 0, p)) < 0 ) + return "(unspecified)"; + /* buffer interface returns bytes, we want + length in characters */ + *q = count/(sizeof(Py_UNICODE)); + format++; + } else { + Py_UNICODE **p = va_arg(*p_va, Py_UNICODE **); + + if (PyUnicode_Check(arg)) + *p = PyUnicode_AS_UNICODE(arg); + else + return "unicode"; + } + break; + } + case 'S': /* string object */ { PyObject **p = va_arg(*p_va, PyObject **); -- cgit v1.2.1