[Python-checkins] r42403 - python/trunk/Objects/bufferobject.c python/trunk/Objects/dictobject.c python/trunk/Objects/funcobject.c python/trunk/Objects/listobject.c python/trunk/Objects/structseq.c
martin.v.loewis
python-checkins at python.org
Thu Feb 16 07:59:23 CET 2006
Author: martin.v.loewis
Date: Thu Feb 16 07:59:22 2006
New Revision: 42403
Modified:
python/trunk/Objects/bufferobject.c
python/trunk/Objects/dictobject.c
python/trunk/Objects/funcobject.c
python/trunk/Objects/listobject.c
python/trunk/Objects/structseq.c
Log:
Revert 42400.
Modified: python/trunk/Objects/bufferobject.c
==============================================================================
--- python/trunk/Objects/bufferobject.c (original)
+++ python/trunk/Objects/bufferobject.c Thu Feb 16 07:59:22 2006
@@ -246,15 +246,15 @@
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);
}
Modified: python/trunk/Objects/dictobject.c
==============================================================================
--- python/trunk/Objects/dictobject.c (original)
+++ python/trunk/Objects/dictobject.c Thu Feb 16 07:59:22 2006
@@ -1149,7 +1149,7 @@
PyErr_Format(PyExc_ValueError,
"dictionary update sequence element #%d "
"has length %zd; 2 is required",
- i, (long)n);
+ i, n);
goto Fail;
}
Modified: python/trunk/Objects/funcobject.c
==============================================================================
--- python/trunk/Objects/funcobject.c (original)
+++ python/trunk/Objects/funcobject.c Thu Feb 16 07:59:22 2006
@@ -251,7 +251,7 @@
"%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 @@
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++) {
Modified: python/trunk/Objects/listobject.c
==============================================================================
--- python/trunk/Objects/listobject.c (original)
+++ python/trunk/Objects/listobject.c Thu Feb 16 07:59:22 2006
@@ -2600,8 +2600,8 @@
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;
}
Modified: python/trunk/Objects/structseq.c
==============================================================================
--- python/trunk/Objects/structseq.c (original)
+++ python/trunk/Objects/structseq.c Thu Feb 16 07:59:22 2006
@@ -126,7 +126,7 @@
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 @@
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 @@
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;
}
More information about the Python-checkins
mailing list