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.
........

diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index b26470ea59257ffd7bc805c28c6e4b9ab92e22c3..8e5142051a2893a12504c1033188e552bd7e1189 100644 (file)
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -671,7 +671,7 @@ deque_repr(PyObject *deque)
        }
        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);
        else
                result = PyUnicode_FromFormat("deque(%R)", aslist);

diff --git a/Modules/_multiprocessing/connection.h b/Modules/_multiprocessing/connection.h
index e422d6999f4b7eb58fc8d561440815bae4aac293..6e823453b673e877f14b37a77d3be33712ba9928 100644 (file)
--- a/Modules/_multiprocessing/connection.h
+++ b/Modules/_multiprocessing/connection.h
@@ -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);
 }

diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h
index ec5042c9d6424a5a9941558b5fc02b85229e6349..0b327905ea3a9b8f0737842a7ace9548bea42a09 100644 (file)
--- a/Modules/_multiprocessing/multiprocessing.h
+++ b/Modules/_multiprocessing/multiprocessing.h
@@ -56,7 +56,6 @@
 #  define PY_SSIZE_T_MAX INT_MAX
 #  define PY_SSIZE_T_MIN INT_MIN
 #  define F_PY_SSIZE_T "i"
-#  define PY_FORMAT_SIZE_T ""
 #  define PyInt_FromSsize_t(n) PyInt_FromLong((long)n)
 #else
 #  define F_PY_SSIZE_T "n"

diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index 63dbc4319bcf76329630ca3cb2286b2ae2a491f2..bf7e4ac1f7aea0dde1bd068fdc6f1e0576c22773 100644 (file)
--- 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");