mirror of
https://github.com/python/cpython.git
synced 2025-07-10 04:45:36 +00:00
Get rid of all #ifdef Py_USING_UNICODE (it is always present now).
(With the help of unifdef from freshmeat.)
This commit is contained in:
parent
938ef57e26
commit
8d30cc0144
36 changed files with 10 additions and 472 deletions
|
@ -468,7 +468,6 @@ PyObject *PyCodec_StrictErrors(PyObject *exc)
|
|||
}
|
||||
|
||||
|
||||
#ifdef Py_USING_UNICODE
|
||||
PyObject *PyCodec_IgnoreErrors(PyObject *exc)
|
||||
{
|
||||
Py_ssize_t end;
|
||||
|
@ -729,7 +728,6 @@ PyObject *PyCodec_BackslashReplaceErrors(PyObject *exc)
|
|||
return NULL;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static PyObject *strict_errors(PyObject *self, PyObject *exc)
|
||||
{
|
||||
|
@ -737,7 +735,6 @@ static PyObject *strict_errors(PyObject *self, PyObject *exc)
|
|||
}
|
||||
|
||||
|
||||
#ifdef Py_USING_UNICODE
|
||||
static PyObject *ignore_errors(PyObject *self, PyObject *exc)
|
||||
{
|
||||
return PyCodec_IgnoreErrors(exc);
|
||||
|
@ -760,7 +757,6 @@ static PyObject *backslashreplace_errors(PyObject *self, PyObject *exc)
|
|||
{
|
||||
return PyCodec_BackslashReplaceErrors(exc);
|
||||
}
|
||||
#endif
|
||||
|
||||
static int _PyCodecRegistry_Init(void)
|
||||
{
|
||||
|
@ -777,7 +773,6 @@ static int _PyCodecRegistry_Init(void)
|
|||
METH_O
|
||||
}
|
||||
},
|
||||
#ifdef Py_USING_UNICODE
|
||||
{
|
||||
"ignore",
|
||||
{
|
||||
|
@ -810,7 +805,6 @@ static int _PyCodecRegistry_Init(void)
|
|||
METH_O
|
||||
}
|
||||
}
|
||||
#endif
|
||||
};
|
||||
|
||||
PyInterpreterState *interp = PyThreadState_GET()->interp;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue