mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-12 13:55:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Added new parser markers 'et' and 'et#' which do not recode string

Browse source 
objects but instead assume that they use the requested encoding.

This is needed on Windows to enable opening files by passing in
Unicode file names.
This commit is contained in:
Marc-André Lemburg 2001-05-02 17:16:16 +00:00
parent b1f35bffe5
commit 6f15e5796e
2 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Python/getargs.c
View file

@ -687,25 +687,39 @@ convertsimple1(PyObject *arg, char **p_format, va_list *p_va)
char **buffer;
const char *encoding;
PyObject *u, *s;
int size;
int size, recode_strings;
/* Get 'e' parameter: the encoding name */
encoding = (const char *)va_arg(*p_va, const char *);
if (encoding == NULL)
encoding = PyUnicode_GetDefaultEncoding();
/* Get 's' parameter: the output buffer to use */
/* Get output buffer parameter:
's' (recode all objects via Unicode) or
't' (only recode non-string objects)
*/
if (*format != 's')
recode_strings = 1;
else if (*format == 't')
recode_strings = 0;
else
return "(unknown parser marker combination)";
buffer = (char **)va_arg(*p_va, char **);
format++;
if (buffer == NULL)
return "(buffer is NULL)";
/* Encode object */
if (!recode_strings && PyString_Check(arg)) {
s = arg;
Py_INCREF(s);
}
else {
/* Convert object to Unicode */
u = PyUnicode_FromObject(arg);
if (u == NULL)
return "string or unicode or text buffer";
return \
"string or unicode or text buffer";
/* Encode object; use default error handling */
s = PyUnicode_AsEncodedString(u,
@ -716,7 +730,9 @@ convertsimple1(PyObject *arg, char **p_format, va_list *p_va)
return "(encoding failed)";
if (!PyString_Check(s)) {
Py_DECREF(s);
return "(encoder failed to return a string)";
return \
"(encoder failed to return a string)";
}
}
size = PyString_GET_SIZE(s);