mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 09:45:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Get rid of all #ifdef Py_USING_UNICODE (it is always present now).

Browse source 
(With the help of unifdef from freshmeat.)
This commit is contained in:
Guido van Rossum 2007-05-03 17:49:24 +00:00
parent 938ef57e26
commit 8d30cc0144
36 changed files with 10 additions and 472 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Python/ast.c
View file

@ -3050,10 +3050,6 @@ parsenumber(const char *s)
static PyObject *
decode_utf8(const char **sPtr, const char *end, char* encoding)
{
#ifndef Py_USING_UNICODE
Py_FatalError("decode_utf8 should not be called in this build.");
return NULL;
#else
PyObject *u, *v;
char *s, *t;
t = s = (char *)*sPtr;
@ -3066,7 +3062,6 @@ decode_utf8(const char **sPtr, const char *end, char* encoding)
v = PyUnicode_AsEncodedString(u, encoding, NULL);
Py_DECREF(u);
return v;
#endif
}
static PyObject *
@ -3186,11 +3181,9 @@ parsestr(const node *n, const char *encoding, int *bytesmode)
return NULL;
}
}
#ifdef Py_USING_UNICODE
if (!*bytesmode) {
return decode_unicode(s, len, rawmode, encoding);
}
#endif
if (*bytesmode) {
/* Disallow non-ascii characters (but not escapes) */
const char *c;
@ -3207,19 +3200,12 @@ parsestr(const node *n, const char *encoding, int *bytesmode)
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. */
Py_FatalError(
"cannot deal with encodings in this build.");
#else
PyObject *v, *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);
}
@ -3258,7 +3244,6 @@ parsestrplus(struct compiling *c, const node *n, int *bytesmode)
if (v == NULL)
goto onError;
}
#ifdef Py_USING_UNICODE
else {
PyObject *temp = PyUnicode_Concat(v, s);
Py_DECREF(s);
@ -3267,7 +3252,6 @@ parsestrplus(struct compiling *c, const node *n, int *bytesmode)
if (v == NULL)
goto onError;
}
#endif
}
}
return v;