summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-09-10 22:24:24 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-09-10 22:24:24 (GMT)
commit245c70b12c7d03f0c32b1a80781d366db15ebea3 (patch)
treeae7f734707c31969ae1af894e190977859ef93c5 /Python
parent9aa4299882500ca3206514bced135c0a1083355d (diff)
downloadcpython-245c70b12c7d03f0c32b1a80781d366db15ebea3.zip
cpython-245c70b12c7d03f0c32b1a80781d366db15ebea3.tar.gz
cpython-245c70b12c7d03f0c32b1a80781d366db15ebea3.tar.bz2
Merged revisions 66377 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r66377 | amaury.forgeotdarc | 2008-09-11 00:04:45 +0200 (jeu., 11 sept. 2008) | 8 lines #3743: PY_FORMAT_SIZE_T is designed for the OS "printf" functions, not for PyString_FromFormat which has an independent implementation, and uses "%zd". This makes a difference on win64, where printf needs "%Id" to display 64bit values. For example, queue.__repr__ was incorrect. Reviewed by Martin von Loewis. ........
Diffstat (limited to 'Python')
-rw-r--r--Python/Python-ast.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index 63dbc43..bf7e4ac 100644
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -412,7 +412,7 @@ ast_type_init(PyObject *self, PyObject *args, PyObject *kw)
if (PyTuple_GET_SIZE(args) > 0) {
if (numfields != PyTuple_GET_SIZE(args)) {
PyErr_Format(PyExc_TypeError, "%.400s constructor takes %s"
- "%" PY_FORMAT_SIZE_T "d positional argument%s",
+ "%zd positional argument%s",
Py_TYPE(self)->tp_name,
numfields == 0 ? "" : "either 0 or ",
numfields, numfields == 1 ? "" : "s");