merge from debian, omit disable of the 0.7 API

1 files changed, 5 insertions, 1 deletions

diff --git a/python/configuration.cc b/python/configuration.cc
index 93e92efa..9000f71f 100644
--- a/python/configuration.cc
+++ b/python/configuration.cc
@@ -92,7 +92,7 @@ static PyObject *CnfFindI(PyObject *Self,PyObject *Args)
    int Default = 0;
    if (PyArg_ParseTuple(Args,"s|i",&Name,&Default) == 0)
       return 0;
-   return Py_BuildValue("i",GetSelf(Self).FindI(Name,Default));
+   return MkPyNumber(GetSelf(Self).FindI(Name,Default));
 }
 
 static const char *doc_FindB =
@@ -438,6 +438,10 @@ PyObject *ParseCommandLine(PyObject *Self,PyObject *Args)
       return 0;
    }
 
+   if (PySequence_Length(Pargv) < 1) {
+      PyErr_SetString(PyExc_ValueError,"argv is an empty sequence");
+      return 0;
+   }
    // Convert the option list
    int Length = PySequence_Length(POList);
    CommandLine::Args *OList = new CommandLine::Args[Length+1];