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

Special case the "s#" PyArg_Parse() token for Unicode objects:

Browse source 
"s#" will now return a pointer to the default encoded string data
of the Unicode object instead of a pointer to the raw UTF-16
data.

The latter is still available via PyObject_AsReadBuffer().

The patch also adds an optimization for string objects which is
based on the fact that string objects return the raw character data
for getreadbuffer access and are always single-segment.
This commit is contained in:
Marc-André Lemburg 2000-09-21 21:08:30 +00:00
parent 3578b77312
commit 0afff388ce
1 changed files with 53 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

79
Python/getargs.c
View file

@ -556,22 +556,36 @@ convertsimple1(PyObject *arg, char **p_format, va_list *p_va)
case 's': /* string */ case 's': /* string */
{ {
if (*format == '#') { /* any buffer-like object */ if (*format == '#') {
void **p = (void **)va_arg(*p_va, char **); void **p = (void **)va_arg(*p_va, char **);
PyBufferProcs *pb = arg->ob_type->tp_as_buffer;
int *q = va_arg(*p_va, int *); int *q = va_arg(*p_va, int *);
int count;
if ( pb == NULL || if (PyString_Check(arg)) {
pb->bf_getreadbuffer == NULL || *p = PyString_AS_STRING(arg);
pb->bf_getsegcount == NULL ) *q = PyString_GET_SIZE(arg);
return "read-only buffer"; }
if ( (*pb->bf_getsegcount)(arg, NULL) != 1 ) else if (PyUnicode_Check(arg)) {
return "single-segment read-only buffer"; arg = _PyUnicode_AsDefaultEncodedString(
if ( (count = arg, NULL);
(*pb->bf_getreadbuffer)(arg, 0, p)) < 0 ) if (arg == NULL)
return "(unspecified)"; return "unicode conversion error";
*q = count; *p = PyString_AS_STRING(arg);
*q = PyString_GET_SIZE(arg);
}
else { /* any buffer-like object */
PyBufferProcs *pb = arg->ob_type->tp_as_buffer;
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)";
*q = count;
}
format++; format++;
} else { } else {
char **p = va_arg(*p_va, char **); char **p = va_arg(*p_va, char **);
@ -597,24 +611,37 @@ convertsimple1(PyObject *arg, char **p_format, va_list *p_va)
{ {
if (*format == '#') { /* any buffer-like object */ if (*format == '#') { /* any buffer-like object */
void **p = (void **)va_arg(*p_va, char **); void **p = (void **)va_arg(*p_va, char **);
PyBufferProcs *pb = arg->ob_type->tp_as_buffer;
int *q = va_arg(*p_va, int *); int *q = va_arg(*p_va, int *);
int count;
if (arg == Py_None) { if (arg == Py_None) {
*p = 0; *p = 0;
*q = 0; *q = 0;
} else { }
if ( pb == NULL || else if (PyString_Check(arg)) {
pb->bf_getreadbuffer == NULL || *p = PyString_AS_STRING(arg);
pb->bf_getsegcount == NULL ) *q = PyString_GET_SIZE(arg);
return "read-only buffer"; }
if ( (*pb->bf_getsegcount)(arg, NULL) != 1 ) else if (PyUnicode_Check(arg)) {
return "single-segment read-only buffer"; arg = _PyUnicode_AsDefaultEncodedString(
if ( (count = (*pb->bf_getreadbuffer) arg, NULL);
(arg, 0, p)) < 0 ) if (arg == NULL)
return "(unspecified)"; return "unicode conversion error";
*q = count; *p = PyString_AS_STRING(arg);
*q = PyString_GET_SIZE(arg);
}
else { /* any buffer-like object */
PyBufferProcs *pb = arg->ob_type->tp_as_buffer;
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)";
*q = count;
} }
format++; format++;
} else { } else {