mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 22:18:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 66377 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Amaury Forgeot d'Arc 2008-09-10 22:24:24 +00:00
parent 9aa4299882
commit 245c70b12c
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/_collectionsmodule.c
View file

@ -671,7 +671,7 @@ deque_repr(PyObject *deque)
} }
if (((dequeobject *)deque)->maxlen != -1) if (((dequeobject *)deque)->maxlen != -1)
result = PyUnicode_FromFormat("deque(%R, maxlen=%" PY_FORMAT_SIZE_T "d)", result = PyUnicode_FromFormat("deque(%R, maxlen=%zd)",
aslist, ((dequeobject *)deque)->maxlen); aslist, ((dequeobject *)deque)->maxlen);
else else
result = PyUnicode_FromFormat("deque(%R)", aslist); result = PyUnicode_FromFormat("deque(%R)", aslist);

6
Modules/_multiprocessing/connection.h
View file

@ -47,8 +47,8 @@ connection_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return NULL; return NULL;
if (handle == INVALID_HANDLE_VALUE || (Py_ssize_t)handle < 0) { if (handle == INVALID_HANDLE_VALUE || (Py_ssize_t)handle < 0) {
PyErr_Format(PyExc_IOError, "invalid handle %" PyErr_Format(PyExc_IOError, "invalid handle %zd",
PY_FORMAT_SIZE_T "d", (Py_ssize_t)handle); (Py_ssize_t)handle);
return NULL; return NULL;
} }
@ -404,7 +404,7 @@ connection_repr(ConnectionObject *self)
static char *conn_type[] = {"read-only", "write-only", "read-write"}; static char *conn_type[] = {"read-only", "write-only", "read-write"};
assert(self->flags >= 1 && self->flags <= 3); assert(self->flags >= 1 && self->flags <= 3);
return FROM_FORMAT("<%s %s, handle %" PY_FORMAT_SIZE_T "d>", return FROM_FORMAT("<%s %s, handle %zd>",
conn_type[self->flags - 1], conn_type[self->flags - 1],
CONNECTION_NAME, (Py_ssize_t)self->handle); CONNECTION_NAME, (Py_ssize_t)self->handle);
} }

1
Modules/_multiprocessing/multiprocessing.h
View file

@ -56,7 +56,6 @@
# define PY_SSIZE_T_MAX INT_MAX # define PY_SSIZE_T_MAX INT_MAX
# define PY_SSIZE_T_MIN INT_MIN # define PY_SSIZE_T_MIN INT_MIN
# define F_PY_SSIZE_T "i" # define F_PY_SSIZE_T "i"
# define PY_FORMAT_SIZE_T ""
# define PyInt_FromSsize_t(n) PyInt_FromLong((long)n) # define PyInt_FromSsize_t(n) PyInt_FromLong((long)n)
#else #else
# define F_PY_SSIZE_T "n" # define F_PY_SSIZE_T "n"

2
Python/Python-ast.c
View file

@ -412,7 +412,7 @@ ast_type_init(PyObject *self, PyObject *args, PyObject *kw)
if (PyTuple_GET_SIZE(args) > 0) { if (PyTuple_GET_SIZE(args) > 0) {
if (numfields != PyTuple_GET_SIZE(args)) { if (numfields != PyTuple_GET_SIZE(args)) {
PyErr_Format(PyExc_TypeError, "%.400s constructor takes %s" 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, Py_TYPE(self)->tp_name,
numfields == 0 ? "" : "either 0 or ", numfields == 0 ? "" : "either 0 or ",
numfields, numfields == 1 ? "" : "s"); numfields, numfields == 1 ? "" : "s");