mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 19:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix PEP 263 code --without-unicode. Fixes #591943.

Browse source
This commit is contained in:
Martin v. Löwis 2002-08-07 12:33:18 +00:00
parent 63d5bead18
commit 019934b3cc
2 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Python/compile.c
View file

@ -1185,6 +1185,9 @@ parsenumber(struct compiling *co, char *s)
static PyObject *
decode_utf8(char **sPtr, char *end, char* encoding)
{
#ifndef Py_USING_UNICODE
abort();
#else
PyObject *u, *v;
char *s, *t;
t = s = *sPtr;
@ -1197,6 +1200,7 @@ decode_utf8(char **sPtr, char *end, char* encoding)
v = PyUnicode_AsEncodedString(u, encoding, NULL);
Py_DECREF(u);
return v;
#endif
}
static PyObject *
@ -1312,12 +1316,18 @@ parsestr(struct compiling *com, char *s)
strcmp(encoding, "iso-8859-1") != 0);
if (rawmode || strchr(s, '\\') == NULL) {
if (need_encoding) {
#ifndef Py_USING_UNICODE
/* This should not happen - we never see any other
encoding. */
abort();
#else
PyObject* u = PyUnicode_DecodeUTF8(s, len, NULL);
if (u == NULL)
return NULL;
v = PyUnicode_AsEncodedString(u, encoding, NULL);
Py_DECREF(u);
return v;
#endif
} else {
return PyString_FromStringAndSize(s, len);
}