diff options
| author | Georg Brandl <georg@python.org> | 2006-05-29 19:39:45 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2006-05-29 19:39:45 (GMT) |
| commit | 2cfaa34dfa2919803a7caf7cfd99aa21d6c40e06 (patch) | |
| tree | 68fad69a60835e80f0ed91d3d38ea8e961efd2c3 | |
| parent | 162997efb10131868b3dd7bec63f1c89b12ec3a5 (diff) | |
| download | cpython-2cfaa34dfa2919803a7caf7cfd99aa21d6c40e06.zip cpython-2cfaa34dfa2919803a7caf7cfd99aa21d6c40e06.tar.gz cpython-2cfaa34dfa2919803a7caf7cfd99aa21d6c40e06.tar.bz2 | |
Correct some value converting strangenesses.
| -rw-r--r-- | Modules/binascii.c | 2 | ||||
| -rw-r--r-- | Modules/mmapmodule.c | 6 | ||||
| -rw-r--r-- | Objects/classobject.c | 4 | ||||
| -rw-r--r-- | Objects/object.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/Modules/binascii.c b/Modules/binascii.c index 4623b7c..71a9624 100644 --- a/Modules/binascii.c +++ b/Modules/binascii.c @@ -644,7 +644,7 @@ binascii_rledecode_hqx(PyObject *self, PyObject *args) /* Empty string is a special case */ if ( in_len == 0 ) - return Py_BuildValue("s", ""); + return PyString_FromString(""); /* Allocate a buffer of reasonable size. Resized when needed */ out_len = in_len*2; diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index 2e34a9f..2e74e37 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -477,7 +477,7 @@ mmap_tell_method(mmap_object *self, PyObject *args) CHECK_VALID(NULL); if (!PyArg_ParseTuple(args, ":tell")) return NULL; - return Py_BuildValue("l", (long) self->pos); + return PyInt_FromLong((long) self->pos); } static PyObject * @@ -493,7 +493,7 @@ mmap_flush_method(mmap_object *self, PyObject *args) return NULL; } else { #ifdef MS_WINDOWS - return Py_BuildValue("l", (long) + return PyInt_FromLong((long) FlushViewOfFile(self->data+offset, size)); #endif /* MS_WINDOWS */ #ifdef UNIX @@ -505,7 +505,7 @@ mmap_flush_method(mmap_object *self, PyObject *args) PyErr_SetFromErrno(mmap_module_error); return NULL; } - return Py_BuildValue("l", (long) 0); + return PyInt_FromLong(0); #endif /* UNIX */ } } diff --git a/Objects/classobject.c b/Objects/classobject.c index 2fb16eb..6d2c648d 100644 --- a/Objects/classobject.c +++ b/Objects/classobject.c @@ -1136,9 +1136,9 @@ instance_ass_item(PyInstanceObject *inst, Py_ssize_t i, PyObject *item) if (func == NULL) return -1; if (item == NULL) - arg = Py_BuildValue("i", i); + arg = PyInt_FromSsize_t(i); else - arg = Py_BuildValue("(iO)", i, item); + arg = Py_BuildValue("(nO)", i, item); if (arg == NULL) { Py_DECREF(func); return -1; diff --git a/Objects/object.c b/Objects/object.c index a75c14e..59d3960 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -112,7 +112,7 @@ get_counts(void) if (result == NULL) return NULL; for (tp = type_list; tp; tp = tp->tp_next) { - v = Py_BuildValue("(siii)", tp->tp_name, tp->tp_allocs, + v = Py_BuildValue("(snnn)", tp->tp_name, tp->tp_allocs, tp->tp_frees, tp->tp_maxalloc); if (v == NULL) { Py_DECREF(result); |