Revert 42400.

diff --git a/Objects/bufferobject.c b/Objects/bufferobject.c
index 73f361ea07e996e58b146bb2f8efc72a9be487db..b0227c12911c2561de2740c30b40fef0e00759b8 100644 (file)
--- a/Objects/bufferobject.c
+++ b/Objects/bufferobject.c
@@ -246,15 +246,15 @@ buffer_repr(PyBufferObject *self)
                return PyString_FromFormat("<%s buffer ptr %p, size %zd at %p>",
                                           status,
                                           self->b_ptr,
-                                          (long)self->b_size,
+                                          self->b_size,
                                           self);
        else
                return PyString_FromFormat(
                        "<%s buffer for %p, size %zd, offset %zd at %p>",
                        status,
                        self->b_base,
-                       (long)self->b_size,
-                       (long)self->b_offset,
+                       self->b_size,
+                       self->b_offset,
                        self);
 }
 

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 7910cb67d0b44ce87b3c42e34c2b87900ed14edb..f5e532028629bbd191cc3d130be9a57490fc3e08 100644 (file)
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -1149,7 +1149,7 @@ PyDict_MergeFromSeq2(PyObject *d, PyObject *seq2, int override)
                        PyErr_Format(PyExc_ValueError,
                                     "dictionary update sequence element #%d "
                                     "has length %zd; 2 is required",
-                                    i, (long)n);
+                                    i, n);
                        goto Fail;
                }
 

diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index ff70baf7d88dd38d129012fdf148ecd3e69a99ee..fe34a11b54314449df76181b745888698f6725e3 100644 (file)
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -251,7 +251,7 @@ func_set_code(PyFunctionObject *op, PyObject *value)
                             "%s() requires a code object with %zd free vars,"
                             " not %zd",
                             PyString_AsString(op->func_name),
-                            (long)nclosure, (long)nfree);
+                            nclosure, nfree);
                return -1;
        }
        tmp = op->func_code;
@@ -403,7 +403,7 @@ func_new(PyTypeObject* type, PyObject* args, PyObject* kw)
                return PyErr_Format(PyExc_ValueError,
                                    "%s requires closure of length %zd, not %zd",
                                    PyString_AS_STRING(code->co_name),
-                                   (long)nfree, (long)nclosure);
+                                   nfree, nclosure);
        if (nclosure) {
                Py_ssize_t i;
                for (i = 0; i < nclosure; i++) {

diff --git a/Objects/listobject.c b/Objects/listobject.c
index a970c146d6bff25a71358c559d3c898fb13cc7de..c083ffc62f4a822e028131bd081175d42c44e1a6 100644 (file)
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -2600,8 +2600,8 @@ list_ass_subscript(PyListObject* self, PyObject* item, PyObject* value)
                        if (PySequence_Fast_GET_SIZE(seq) != slicelength) {
                                PyErr_Format(PyExc_ValueError,
             "attempt to assign sequence of size %zd to extended slice of size %zd",
-                                            (long)PySequence_Fast_GET_SIZE(seq),
-                                            (long)slicelength);
+                                            PySequence_Fast_GET_SIZE(seq),
+                                            slicelength);
                                Py_DECREF(seq);
                                return -1;
                        }

diff --git a/Objects/structseq.c b/Objects/structseq.c
index 7a01fc4a8af3b5c9fbf6c254c51ee58e602f12f8..023a1fdbaabaa786b085b1d33d8a3d9e4414221d 100644 (file)
--- a/Objects/structseq.c
+++ b/Objects/structseq.c
@@ -126,7 +126,7 @@ structseq_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
                if (len < min_len) {
                        PyErr_Format(PyExc_TypeError, 
               "%.500s() takes an at least %zd-sequence (%zd-sequence given)",
-                                    type->tp_name, (long)min_len, (long)len);
+                                    type->tp_name, min_len, len);
                        Py_DECREF(arg);
                        return NULL;
                }
@@ -134,7 +134,7 @@ structseq_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
                if (len > max_len) {
                        PyErr_Format(PyExc_TypeError, 
               "%.500s() takes an at most %zd-sequence (%zd-sequence given)",
-                                    type->tp_name, (long)max_len, (long)len);
+                                    type->tp_name, max_len, len);
                        Py_DECREF(arg);
                        return NULL;
                }
@@ -143,7 +143,7 @@ structseq_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
                if (len != min_len) {
                        PyErr_Format(PyExc_TypeError, 
               "%.500s() takes a %zd-sequence (%zd-sequence given)",
-                                    type->tp_name, (long)min_len, (long)len);
+                                    type->tp_name, min_len, len);
                        Py_DECREF(arg);
                        return NULL;
                }