python/: Convert most names to PEP8 naming conventions (except Version,PackageFile,MetaIndex).

On our way to close Bug#481061, this converts almost all names to PEP 8 naming
conventions. Missing are now apt_pkg.Version, apt_pkg.PackageFile, apt_pkg.MetaIndex
and apt.progress.*.

In case of the missing apt_pkg classes, they are not converted yet because they
do not use getset descriptors yet.

apt.progress.* has not been converted yet because the extension interacts with it,
and we first need to modify the extension to recognize the new names, as well as
the old names (old applications shouldn't break).

1 files changed, 18 insertions, 3 deletions

diff --git a/python/configuration.cc b/python/configuration.cc
index abbed6d9..107cf90f 100644
--- a/python/configuration.cc
+++ b/python/configuration.cc
@@ -453,13 +453,26 @@ PyObject *ParseCommandLine(PyObject *Self,PyObject *Args)
 static PyMethodDef CnfMethods[] =
 {
    // Query
+   {"find",CnfFind,METH_VARARGS,doc_Find},
+   {"find_file",CnfFindFile,METH_VARARGS,doc_FindFile},
+   {"find_dir",CnfFindDir,METH_VARARGS,doc_FindDir},
+   {"find_i",CnfFindI,METH_VARARGS,doc_FindI},
+   {"find_b",CnfFindB,METH_VARARGS,doc_FindB},
+
+   // Others
+   {"set",CnfSet,METH_VARARGS,doc_Set},
+   {"exists",CnfExists,METH_VARARGS,doc_Exists},
+   {"subtree",CnfSubTree,METH_VARARGS,doc_SubTree},
+   {"list",CnfList,METH_VARARGS,doc_List},
+   {"valuelist",CnfValueList,METH_VARARGS,doc_ValueList},
+   {"mytag",CnfMyTag,METH_VARARGS,doc_MyTag},
+   {"clear",CnfClear,METH_VARARGS,doc_Clear},
+#ifdef COMPAT_0_7
    {"Find",CnfFind,METH_VARARGS,doc_Find},
    {"FindFile",CnfFindFile,METH_VARARGS,doc_FindFile},
    {"FindDir",CnfFindDir,METH_VARARGS,doc_FindDir},
    {"FindI",CnfFindI,METH_VARARGS,doc_FindI},
    {"FindB",CnfFindB,METH_VARARGS,doc_FindB},
-
-   // Others
    {"Set",CnfSet,METH_VARARGS,doc_Set},
    {"Exists",CnfExists,METH_VARARGS,doc_Exists},
    {"SubTree",CnfSubTree,METH_VARARGS,doc_SubTree},
@@ -467,10 +480,12 @@ static PyMethodDef CnfMethods[] =
    {"ValueList",CnfValueList,METH_VARARGS,doc_ValueList},
    {"MyTag",CnfMyTag,METH_VARARGS,doc_MyTag},
    {"Clear",CnfClear,METH_VARARGS,doc_Clear},
-
+#endif
    // Python Special
    {"keys",CnfKeys,METH_VARARGS,doc_Keys},
+   #if PY_MAJOR_VERSION < 3
    {"has_key",CnfExists,METH_VARARGS,doc_Exists},
+   #endif
    {"get",CnfFind,METH_VARARGS,doc_Find},
    {}
 };