summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-07-04 20:47:46 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-07-04 20:47:46 (GMT)
commita33bce09451fa6b1b0df89bd131a812631db401b (patch)
treec2fc73e97d170fd1fd03bd93d43df0633cb29b5a
parent3410af45f8d2b8479e9a9db29f4631799820ec21 (diff)
downloadcpython-a33bce09451fa6b1b0df89bd131a812631db401b.zip
cpython-a33bce09451fa6b1b0df89bd131a812631db401b.tar.gz
cpython-a33bce09451fa6b1b0df89bd131a812631db401b.tar.bz2
Issue #21892, #21893: Partial revert of changeset 4f55e802baf0, PyErr_Format()
uses "%zd" for Py_ssize_t, not PY_FORMAT_SIZE_T
-rw-r--r--Objects/unicodeobject.c26
1 files changed, 8 insertions, 18 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 6296d7d..d9c131c 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -1372,9 +1372,8 @@ PyUnicode_CopyCharacters(PyObject *to, Py_ssize_t to_start,
how_many = Py_MIN(PyUnicode_GET_LENGTH(from), how_many);
if (to_start + how_many > PyUnicode_GET_LENGTH(to)) {
PyErr_Format(PyExc_SystemError,
- "Cannot write %" PY_FORMAT_SIZE_T "i characters at %"
- PY_FORMAT_SIZE_T "i in a string of %"
- PY_FORMAT_SIZE_T "i characters",
+ "Cannot write %zi characters at %zi "
+ "in a string of %zi characters",
how_many, to_start, PyUnicode_GET_LENGTH(to));
return -1;
}
@@ -4083,9 +4082,7 @@ unicode_decode_call_errorhandler_wchar(
if (newpos<0)
newpos = insize+newpos;
if (newpos<0 || newpos>insize) {
- PyErr_Format(PyExc_IndexError,
- "position %" PY_FORMAT_SIZE_T
- "d from error handler out of bounds", newpos);
+ PyErr_Format(PyExc_IndexError, "position %zd from error handler out of bounds", newpos);
goto onError;
}
@@ -4178,9 +4175,7 @@ unicode_decode_call_errorhandler_writer(
if (newpos<0)
newpos = insize+newpos;
if (newpos<0 || newpos>insize) {
- PyErr_Format(PyExc_IndexError,
- "position %" PY_FORMAT_SIZE_T
- "d from error handler out of bounds", newpos);
+ PyErr_Format(PyExc_IndexError, "position %zd from error handler out of bounds", newpos);
goto onError;
}
@@ -6443,9 +6438,7 @@ unicode_encode_call_errorhandler(const char *errors,
if (*newpos<0)
*newpos = len + *newpos;
if (*newpos<0 || *newpos>len) {
- PyErr_Format(PyExc_IndexError,
- "position %" PY_FORMAT_SIZE_T
- "d from error handler out of bounds", *newpos);
+ PyErr_Format(PyExc_IndexError, "position %zd from error handler out of bounds", *newpos);
Py_DECREF(restuple);
return NULL;
}
@@ -8468,9 +8461,7 @@ unicode_translate_call_errorhandler(const char *errors,
else
*newpos = i_newpos;
if (*newpos<0 || *newpos>PyUnicode_GET_LENGTH(unicode)) {
- PyErr_Format(PyExc_IndexError,
- "position %" PY_FORMAT_SIZE_T
- "d from error handler out of bounds", *newpos);
+ PyErr_Format(PyExc_IndexError, "position %zd from error handler out of bounds", *newpos);
Py_DECREF(restuple);
return NULL;
}
@@ -9752,8 +9743,7 @@ PyUnicode_Join(PyObject *separator, PyObject *seq)
item = items[i];
if (!PyUnicode_Check(item)) {
PyErr_Format(PyExc_TypeError,
- "sequence item %" PY_FORMAT_SIZE_T
- "d: expected str instance,"
+ "sequence item %zd: expected str instance,"
" %.80s found",
i, Py_TYPE(item)->tp_name);
goto onError;
@@ -14452,7 +14442,7 @@ unicode_format_arg_format(struct unicode_formatter_t *ctx,
default:
PyErr_Format(PyExc_ValueError,
"unsupported format character '%c' (0x%x) "
- "at index %" PY_FORMAT_SIZE_T "d",
+ "at index %zd",
(31<=arg->ch && arg->ch<=126) ? (char)arg->ch : '?',
(int)arg->ch,
ctx->fmtpos - 1);