mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-21 14:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Inline raise_translate_exception(): it is only used once

Browse source
This commit is contained in:
Victor Stinner 2012-10-23 02:51:50 +02:00
parent e5567ad236
commit 6fa627578a
1 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Objects/unicodeobject.c
View file

@ -8064,19 +8064,6 @@ make_translate_exception(PyObject **exceptionObject,
} }
} }
/* raises a UnicodeTranslateError */
static void
raise_translate_exception(PyObject **exceptionObject,
PyObject *unicode,
Py_ssize_t startpos, Py_ssize_t endpos,
const char *reason)
{
make_translate_exception(exceptionObject,
unicode, startpos, endpos, reason);
if (*exceptionObject != NULL)
PyCodec_StrictErrors(*exceptionObject);
}
/* error handling callback helper: /* error handling callback helper:
build arguments, call the callback and check the arguments, build arguments, call the callback and check the arguments,
put the result into newpos and return the replacement string, which put the result into newpos and return the replacement string, which
@ -8352,8 +8339,10 @@ _PyUnicode_TranslateCharmap(PyObject *input,
} }
switch (known_errorHandler) { switch (known_errorHandler) {
case 1: /* strict */ case 1: /* strict */
raise_translate_exception(&exc, input, collstart, make_translate_exception(&exc,
collend, reason); input, collstart, collend, reason);
if (exc != NULL)
PyCodec_StrictErrors(exc);
goto onError; goto onError;
case 2: /* replace */ case 2: /* replace */
/* No need to check for space, this is a 1:1 replacement */ /* No need to check for space, this is a 1:1 replacement */