mirror of
https://github.com/python/cpython.git
synced 2025-07-24 11:44:31 +00:00
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. ........
This commit is contained in:
parent
9aa4299882
commit
245c70b12c
4 changed files with 5 additions and 6 deletions
|
@ -47,8 +47,8 @@ connection_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|||
return NULL;
|
||||
|
||||
if (handle == INVALID_HANDLE_VALUE || (Py_ssize_t)handle < 0) {
|
||||
PyErr_Format(PyExc_IOError, "invalid handle %"
|
||||
PY_FORMAT_SIZE_T "d", (Py_ssize_t)handle);
|
||||
PyErr_Format(PyExc_IOError, "invalid handle %zd",
|
||||
(Py_ssize_t)handle);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -404,7 +404,7 @@ connection_repr(ConnectionObject *self)
|
|||
static char *conn_type[] = {"read-only", "write-only", "read-write"};
|
||||
|
||||
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],
|
||||
CONNECTION_NAME, (Py_ssize_t)self->handle);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue