Python archscore() only ever takes one argument, simplify
authorPanu Matilainen <pmatilai@redhat.com>
Wed, 18 Nov 2009 08:54:58 +0000 (10:54 +0200)
committerPanu Matilainen <pmatilai@redhat.com>
Wed, 18 Nov 2009 08:54:58 +0000 (10:54 +0200)
python/rpmmodule.c

index 128eb54..6804296 100644 (file)
 
 PyObject * pyrpmError;
 
-static PyObject * archScore(PyObject * self, PyObject * args, PyObject * kwds)
+static PyObject * archScore(PyObject * self, PyObject * arg)
 {
     char * arch;
-    int score;
-    char * kwlist[] = {"arch", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwds, "s", kwlist, &arch))
+    if (!PyArg_Parse(arg, "s", &arch))
        return NULL;
 
-    score = rpmMachineScore(RPM_MACHTABLE_INSTARCH, arch);
-
-    return Py_BuildValue("i", score);
+    return Py_BuildValue("i", rpmMachineScore(RPM_MACHTABLE_INSTARCH, arch));
 }
 
 static PyObject * signalCaught(PyObject *self, PyObject *o)
@@ -134,7 +130,7 @@ static PyMethodDef rpmModuleMethods[] = {
     { "expandMacro", (PyCFunction) rpmmacro_ExpandMacro, METH_VARARGS|METH_KEYWORDS,
        NULL },
 
-    { "archscore", (PyCFunction) archScore, METH_VARARGS|METH_KEYWORDS,
+    { "archscore", (PyCFunction) archScore, METH_O,
        NULL },
 
     { "signalCaught", (PyCFunction) signalCaught, METH_O,