#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/Misc/NEWS b/Misc/NEWS
index 4696a805e3dc6932c15f4febbaa7f63627bf80cb..b9ec0e164922d9d95b71425db421e6418b66409d 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,14 @@ What's New in Python 2.6 release candidate 1?
 Core and Builtins
 -----------------
 
+- Issue #3743: In a few places, PY_FORMAT_SIZE_T was incorrectly used with
+  PyString_FromFormat or PyErr_Format to display size_t values. The macro
+  PY_FORMAT_SIZE_T is designed to select the correct format for the OS
+  ``printf`` function, whereas PyString_FromFormat has an independent
+  implementation and uses "%zd" on all platforms for size_t values.
+  This makes a difference on win64, where ``printf`` needs "%Id" to display
+  64bit values.
+
 - Issue #3634: _weakref.ref(Exception).__init__() gave invalid return value on
   error.
 

diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index d6dcffd413358c3f4e7f9bd75dfc21ff5414c06a..da000d0e80bf50660a7967fee1b16c9c5617f560 100644 (file)
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -670,7 +670,7 @@ deque_repr(PyObject *deque)
                return NULL;
        }
        if (((dequeobject *)deque)->maxlen != -1)
-               fmt = PyString_FromFormat("deque(%%r, maxlen=%" PY_FORMAT_SIZE_T "d)", 
+               fmt = PyString_FromFormat("deque(%%r, maxlen=%zd)", 
                                        ((dequeobject *)deque)->maxlen);
        else
                fmt = PyString_FromString("deque(%r)");  

diff --git a/Modules/_multiprocessing/connection.h b/Modules/_multiprocessing/connection.h
index 66a3e8ad86a963862ccce57e7dd49a291921b2cb..155b61b57ca458287d4fb4ec9114d83cb8995761 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;
        }
 
@@ -396,7 +396,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 f958145a23317903b2cdab062b85c47b4fb368b5..1c78515bceac9e2f1284b3d2fdf40a3dfb8b6939 100644 (file)
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -387,7 +387,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");