Correct some value converting strangenesses.
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 @@
/* 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 @@
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 @@
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 @@
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 @@
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 @@
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);