mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Revert 42400.

Browse source
This commit is contained in:
Martin v. Löwis 2006-02-16 06:59:22 +00:00
parent 2c95cc6d72
commit e0e89f7920
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Objects/bufferobject.c
View file

@ -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);
}

2
Objects/dictobject.c
View file

@ -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;
}

4
Objects/funcobject.c
View file

@ -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++) {

4
Objects/listobject.c
View file

@ -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;
}

6
Objects/structseq.c
View file

@ -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;
}