summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
Diffstat (limited to 'python')
-rw-r--r--python/acquire.cc8
-rw-r--r--python/apt_pkgmodule.cc36
-rw-r--r--python/cache.cc30
-rw-r--r--python/configuration.cc6
-rw-r--r--python/depcache.cc20
-rw-r--r--python/pkgrecords.cc16
-rw-r--r--python/pkgsrcrecords.cc2
-rw-r--r--python/tag.cc2
8 files changed, 60 insertions, 60 deletions
diff --git a/python/acquire.cc b/python/acquire.cc
index 6cb2130c..1b1c5dd8 100644
--- a/python/acquire.cc
+++ b/python/acquire.cc
@@ -39,10 +39,10 @@ MkGet(AcquireItemGetStatAuthError,Py_BuildValue("i", pkgAcquire::Item::StatAuthE
static PyGetSetDef AcquireItemGetSet[] = {
{"complete",AcquireItemGetComplete},
- {"descuri",AcquireItemGetDescURI},
- {"destfile",AcquireItemGetDestFile},
- {"errortext",AcquireItemGetErrorText},
- {"filesize",AcquireItemGetFileSize},
+ {"desc_uri",AcquireItemGetDescURI},
+ {"dest_file",AcquireItemGetDestFile},
+ {"error_text",AcquireItemGetErrorText},
+ {"file_size",AcquireItemGetFileSize},
{"is",AcquireItemGetID},
{"is_trusted",AcquireItemGetIsTrusted},
{"local",AcquireItemGetLocal},
diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc
index 44234f8d..8259d7c3 100644
--- a/python/apt_pkgmodule.cc
+++ b/python/apt_pkgmodule.cc
@@ -407,7 +407,7 @@ static PyMethodDef methods[] =
// Locking
{"get_lock",GetLock,METH_VARARGS,doc_GetLock},
{"pkgsystem_lock",PkgSystemLock,METH_VARARGS,doc_PkgSystemLock},
- {"pkgsystem_unlock",PkgSystemUnLock,METH_VARARGS,doc_PkgSystemUnLock},
+ {"pkgsystem_un_lock",PkgSystemUnLock,METH_VARARGS,doc_PkgSystemUnLock},
#ifdef COMPAT_0_7
{"GetLock",GetLock,METH_VARARGS,doc_GetLock},
{"PkgSystemLock",PkgSystemLock,METH_VARARGS,doc_PkgSystemLock},
@@ -415,10 +415,10 @@ static PyMethodDef methods[] =
#endif
// Command line
- {"read_configfile",LoadConfig,METH_VARARGS,doc_LoadConfig},
- {"read_configdir",LoadConfigDir,METH_VARARGS,doc_LoadConfigDir},
- {"read_configfile_isc",LoadConfigISC,METH_VARARGS,doc_LoadConfig},
- {"parse_commandline",ParseCommandLine,METH_VARARGS,doc_ParseCommandLine},
+ {"read_config_file",LoadConfig,METH_VARARGS,doc_LoadConfig},
+ {"read_config_dir",LoadConfigDir,METH_VARARGS,doc_LoadConfigDir},
+ {"read_config_file_isc",LoadConfigISC,METH_VARARGS,doc_LoadConfig},
+ {"parse_command_line",ParseCommandLine,METH_VARARGS,doc_ParseCommandLine},
#ifdef COMPAT_0_7
{"ReadConfigFile",LoadConfig,METH_VARARGS,doc_LoadConfig},
{"ReadConfigDir",LoadConfigDir,METH_VARARGS,doc_LoadConfigDir},
@@ -438,7 +438,7 @@ static PyMethodDef methods[] =
// Depends
{"parse_depends",ParseDepends,METH_VARARGS,doc_ParseDepends},
- {"parse_srcdepends",ParseSrcDepends,METH_VARARGS,doc_ParseDepends},
+ {"parse_src_depends",ParseSrcDepends,METH_VARARGS,doc_ParseDepends},
#ifdef COMPAT_0_7
{"ParseDepends",ParseDepends,METH_VARARGS,doc_ParseDepends},
{"ParseSrcDepends",ParseSrcDepends,METH_VARARGS,doc_ParseDepends},
@@ -450,12 +450,12 @@ static PyMethodDef methods[] =
{"sha256sum",sha256sum,METH_VARARGS,doc_sha256sum},
// Strings
- {"check_domainlist",StrCheckDomainList,METH_VARARGS,"CheckDomainList(String,String) -> Bool"},
+ {"check_domain_list",StrCheckDomainList,METH_VARARGS,"CheckDomainList(String,String) -> Bool"},
{"quote_string",StrQuoteString,METH_VARARGS,"QuoteString(String,String) -> String"},
- {"dequote_string",StrDeQuote,METH_VARARGS,"DeQuoteString(String) -> String"},
+ {"de_quote_string",StrDeQuote,METH_VARARGS,"DeQuoteString(String) -> String"},
{"size_to_str",StrSizeToStr,METH_VARARGS,"SizeToStr(int) -> String"},
{"time_to_str",StrTimeToStr,METH_VARARGS,"TimeToStr(int) -> String"},
- {"uri_to_filename",StrURItoFileName,METH_VARARGS,"URItoFileName(String) -> String"},
+ {"uri_to_file_name",StrURItoFileName,METH_VARARGS,"URItoFileName(String) -> String"},
{"base64_encode",StrBase64Encode,METH_VARARGS,"Base64Encode(String) -> String"},
{"string_to_bool",StrStringToBool,METH_VARARGS,"StringToBool(String) -> int"},
{"time_rfc1123",StrTimeRFC1123,METH_VARARGS,"TimeRFC1123(int) -> String"},
@@ -644,7 +644,7 @@ extern "C" void initapt_pkg()
// My constants
PyModule_AddIntConstant(Module,"DEP_DEPENDS",pkgCache::Dep::Depends);
- PyModule_AddIntConstant(Module,"DEP_PREDEPENDS",pkgCache::Dep::PreDepends);
+ PyModule_AddIntConstant(Module,"DEP_PRE_DEPENDS",pkgCache::Dep::PreDepends);
PyModule_AddIntConstant(Module,"DEP_SUGGESTS",pkgCache::Dep::Suggests);
PyModule_AddIntConstant(Module,"DEP_RECOMMENDS",pkgCache::Dep::Recommends);
PyModule_AddIntConstant(Module,"DEP_CONFLICTS",pkgCache::Dep::Conflicts);
@@ -673,23 +673,23 @@ extern "C" void initapt_pkg()
PyModule_AddIntConstant(Module,"PriExtra",pkgCache::State::Extra);
#endif
// CurState
- PyModule_AddIntConstant(Module,"CURSTATE_NOTINSTALLED",pkgCache::State::NotInstalled);
- PyModule_AddIntConstant(Module,"CURSTATE_UNPACKED",pkgCache::State::UnPacked);
- PyModule_AddIntConstant(Module,"CURSTATE_HALFCONFIGURED",pkgCache::State::HalfConfigured);
- PyModule_AddIntConstant(Module,"CURSTATE_HALFINSTALLED",pkgCache::State::HalfInstalled);
- PyModule_AddIntConstant(Module,"CURSTATE_CONFIGFILES",pkgCache::State::ConfigFiles);
+ PyModule_AddIntConstant(Module,"CURSTATE_NOT_INSTALLED",pkgCache::State::NotInstalled);
+ PyModule_AddIntConstant(Module,"CURSTATE_UN_PACKED",pkgCache::State::UnPacked);
+ PyModule_AddIntConstant(Module,"CURSTATE_HALF_CONFIGURED",pkgCache::State::HalfConfigured);
+ PyModule_AddIntConstant(Module,"CURSTATE_HALF_INSTALLED",pkgCache::State::HalfInstalled);
+ PyModule_AddIntConstant(Module,"CURSTATE_CONFIG_FILES",pkgCache::State::ConfigFiles);
PyModule_AddIntConstant(Module,"CURSTATE_INSTALLED",pkgCache::State::Installed);
// SelState
PyModule_AddIntConstant(Module,"SELSTATE_UNKNOWN",pkgCache::State::Unknown);
PyModule_AddIntConstant(Module,"SELSTATE_INSTALL",pkgCache::State::Install);
PyModule_AddIntConstant(Module,"SELSTATE_HOLD",pkgCache::State::Hold);
- PyModule_AddIntConstant(Module,"SELSTATE_DEINSTALL",pkgCache::State::DeInstall);
+ PyModule_AddIntConstant(Module,"SELSTATE_DE_INSTALL",pkgCache::State::DeInstall);
PyModule_AddIntConstant(Module,"SELSTATE_PURGE",pkgCache::State::Purge);
// InstState
PyModule_AddIntConstant(Module,"INSTSTATE_OK",pkgCache::State::Ok);
- PyModule_AddIntConstant(Module,"INSTSTATE_REINSTREQ",pkgCache::State::ReInstReq);
+ PyModule_AddIntConstant(Module,"INSTSTATE_RE_INST_REQ",pkgCache::State::ReInstReq);
PyModule_AddIntConstant(Module,"INSTSTATE_HOLD",pkgCache::State::Hold);
- PyModule_AddIntConstant(Module,"INSTSTATE_HOLD_REINSTREQ",pkgCache::State::HoldReInstReq);
+ PyModule_AddIntConstant(Module,"INSTSTATE_HOLD_RE_INST_REQ",pkgCache::State::HoldReInstReq);
#ifdef COMPAT_0_7
PyModule_AddIntConstant(Module,"CurStateNotInstalled",pkgCache::State::NotInstalled);
diff --git a/python/cache.cc b/python/cache.cc
index c7694026..27b77773 100644
--- a/python/cache.cc
+++ b/python/cache.cc
@@ -196,12 +196,12 @@ static PyObject *PkgCacheGetFileList(PyObject *Self, void*) {
static PyGetSetDef PkgCacheGetSet[] = {
{"depends_count",PkgCacheGetDependsCount},
- {"filelist",PkgCacheGetFileList},
+ {"file_list",PkgCacheGetFileList},
{"package_count",PkgCacheGetPackageCount},
- {"packagefile_count",PkgCacheGetPackageFileCount},
+ {"package_file_count",PkgCacheGetPackageFileCount},
{"packages",PkgCacheGetPackages},
{"provides_count",PkgCacheGetProvidesCount},
- {"verfile_count",PkgCacheGetVerFileCount},
+ {"ver_file_count",PkgCacheGetVerFileCount},
{"version_count",PkgCacheGetVersionCount},
#ifdef COMPAT_0_7
{"DependsCount",PkgCacheGetDependsCount},
@@ -499,8 +499,8 @@ static PyObject *PackageGetCurrentVer(PyObject *Self,void*)
static PyGetSetDef PackageGetSet[] = {
{"name",PackageGetName},
{"section",PackageGetSection},
- {"revdependslist",PackageGetRevDependsList},
- {"provideslist",PackageGetProvidesList},
+ {"rev_depends_list",PackageGetRevDependsList},
+ {"provides_list",PackageGetProvidesList},
{"selected_state",PackageGetSelectedState},
{"inst_state",PackageGetInstState},
{"current_state",PackageGetCurrentState},
@@ -508,8 +508,8 @@ static PyGetSetDef PackageGetSet[] = {
{"auto",PackageGetAuto},
{"essential",PackageGetEssential},
{"important",PackageGetImportant},
- {"versionlist",PackageGetVersionList},
- {"currentver",PackageGetCurrentVer},
+ {"version_list",PackageGetVersionList},
+ {"current_ver",PackageGetCurrentVer},
#ifdef COMPAT_0_7
{"Name",PackageGetName},
{"Section",PackageGetSection},
@@ -609,9 +609,9 @@ static PyObject *DescriptionGetFileList(PyObject *Self,void*)
}
static PyGetSetDef DescriptionGetSet[] = {
- {"languagecode",DescriptionGetLanguageCode},
+ {"language_code",DescriptionGetLanguageCode},
{"md5",DescriptionGetMd5},
- {"filelist",DescriptionGetFileList},
+ {"file_list",DescriptionGetFileList},
#ifdef COMPAT_0_7
{"LanguageCode",DescriptionGetLanguageCode},
{"FileList",DescriptionGetFileList},
@@ -1212,13 +1212,13 @@ static PyObject *DependencyGetID(PyObject *Self,void*)
}
static PyGetSetDef DependencyGetSet[] = {
- {"comptype",DependencyGetCompType},
- {"deptype",DependencyGetDepType},
+ {"comp_type",DependencyGetCompType},
+ {"dep_type",DependencyGetDepType},
{"id",DependencyGetID},
- {"parentpkg",DependencyGetParentPkg},
- {"parentver",DependencyGetParentVer},
- {"targetpkg",DependencyGetTargetPkg},
- {"targetver",DependencyGetTargetVer},
+ {"parent_pkg",DependencyGetParentPkg},
+ {"parent_ver",DependencyGetParentVer},
+ {"target_pkg",DependencyGetTargetPkg},
+ {"target_ver",DependencyGetTargetVer},
#ifdef COMPAT_0_7
{"CompType",DependencyGetCompType},
{"DepType",DependencyGetDepType},
diff --git a/python/configuration.cc b/python/configuration.cc
index 107cf90f..7b08d90e 100644
--- a/python/configuration.cc
+++ b/python/configuration.cc
@@ -462,10 +462,10 @@ static PyMethodDef CnfMethods[] =
// Others
{"set",CnfSet,METH_VARARGS,doc_Set},
{"exists",CnfExists,METH_VARARGS,doc_Exists},
- {"subtree",CnfSubTree,METH_VARARGS,doc_SubTree},
+ {"sub_tree",CnfSubTree,METH_VARARGS,doc_SubTree},
{"list",CnfList,METH_VARARGS,doc_List},
- {"valuelist",CnfValueList,METH_VARARGS,doc_ValueList},
- {"mytag",CnfMyTag,METH_VARARGS,doc_MyTag},
+ {"value_list",CnfValueList,METH_VARARGS,doc_ValueList},
+ {"my_tag",CnfMyTag,METH_VARARGS,doc_MyTag},
{"clear",CnfClear,METH_VARARGS,doc_Clear},
#ifdef COMPAT_0_7
{"Find",CnfFind,METH_VARARGS,doc_Find},
diff --git a/python/depcache.cc b/python/depcache.cc
index f3b16211..650dcb23 100644
--- a/python/depcache.cc
+++ b/python/depcache.cc
@@ -529,19 +529,19 @@ static PyObject *PkgDepCacheMarkedReinstall(PyObject *Self,PyObject *Args)
static PyMethodDef PkgDepCacheMethods[] =
{
{"init",PkgDepCacheInit,METH_VARARGS,"Init the depcache (done on construct automatically)"},
- {"get_candidate",PkgDepCacheGetCandidateVer,METH_VARARGS,"Get candidate version"},
- {"set_candidate",PkgDepCacheSetCandidateVer,METH_VARARGS,"Set candidate version"},
+ {"get_candidate_ver",PkgDepCacheGetCandidateVer,METH_VARARGS,"Get candidate version"},
+ {"set_candidate_ver",PkgDepCacheSetCandidateVer,METH_VARARGS,"Set candidate version"},
// global cache operations
{"upgrade",PkgDepCacheUpgrade,METH_VARARGS,"Perform Upgrade (optional boolean argument if dist-upgrade should be performed)"},
{"fix_broken",PkgDepCacheFixBroken,METH_VARARGS,"Fix broken packages"},
- {"read_pinfile",PkgDepCacheReadPinFile,METH_VARARGS,"Read the pin policy"},
+ {"read_pin_file",PkgDepCacheReadPinFile,METH_VARARGS,"Read the pin policy"},
{"minimize_upgrade",PkgDepCacheMinimizeUpgrade, METH_VARARGS,"Go over the entire set of packages and try to keep each package marked for upgrade. If a conflict is generated then the package is restored."},
// Manipulators
{"mark_keep",PkgDepCacheMarkKeep,METH_VARARGS,"Mark package for keep"},
{"mark_delete",PkgDepCacheMarkDelete,METH_VARARGS,"Mark package for delete (optional boolean argument if it should be purged)"},
{"mark_install",PkgDepCacheMarkInstall,METH_VARARGS,"Mark package for Install"},
- {"set_reinstall",PkgDepCacheSetReInstall,METH_VARARGS,"Set if the package should be reinstalled"},
+ {"set_re_install",PkgDepCacheSetReInstall,METH_VARARGS,"Set if the package should be reinstalled"},
// state information
{"is_upgradable",PkgDepCacheIsUpgradable,METH_VARARGS,"Is pkg upgradable"},
{"is_now_broken",PkgDepCacheIsNowBroken,METH_VARARGS,"Is pkg is now broken"},
@@ -607,12 +607,12 @@ static PyObject *PkgDepCacheGetDebSize(PyObject *Self,void*) {
#undef depcache
static PyGetSetDef PkgDepCacheGetSet[] = {
- {"brokencount",PkgDepCacheGetBrokenCount},
- {"debsize",PkgDepCacheGetDebSize},
- {"delcount",PkgDepCacheGetDelCount},
- {"instcount",PkgDepCacheGetInstCount},
- {"keepcount",PkgDepCacheGetKeepCount},
- {"usrsize",PkgDepCacheGetUsrSize},
+ {"broken_count",PkgDepCacheGetBrokenCount},
+ {"deb_size",PkgDepCacheGetDebSize},
+ {"del_count",PkgDepCacheGetDelCount},
+ {"inst_count",PkgDepCacheGetInstCount},
+ {"keep_count",PkgDepCacheGetKeepCount},
+ {"usr_size",PkgDepCacheGetUsrSize},
#ifdef COMPAT_0_7
{"BrokenCount",PkgDepCacheGetBrokenCount},
{"DebSize",PkgDepCacheGetDebSize},
diff --git a/python/pkgrecords.cc b/python/pkgrecords.cc
index f9e48352..48440387 100644
--- a/python/pkgrecords.cc
+++ b/python/pkgrecords.cc
@@ -120,18 +120,18 @@ static PyObject *PkgRecordsGetRecord(PyObject *Self,void*) {
return PyString_FromStringAndSize(start,stop-start);
}
static PyGetSetDef PkgRecordsGetSet[] = {
- {"filename",PkgRecordsGetFileName},
+ {"file_name",PkgRecordsGetFileName},
{"homepage",PkgRecordsGetHomepage},
- {"longdesc",PkgRecordsGetLongDesc},
- {"md5",PkgRecordsGetMD5Hash},
+ {"long_desc",PkgRecordsGetLongDesc},
+ {"md5_hash",PkgRecordsGetMD5Hash},
{"maintainer",PkgRecordsGetMaintainer},
{"name",PkgRecordsGetName},
{"record",PkgRecordsGetRecord},
- {"sha1",PkgRecordsGetSHA1Hash},
- {"sha256",PkgRecordsGetSHA256Hash},
- {"shortdesc",PkgRecordsGetShortDesc},
- {"sourcepkg",PkgRecordsGetSourcePkg},
- {"sourcever",PkgRecordsGetSourceVer},
+ {"sha1_hash",PkgRecordsGetSHA1Hash},
+ {"sha256_hash",PkgRecordsGetSHA256Hash},
+ {"short_desc",PkgRecordsGetShortDesc},
+ {"source_pkg",PkgRecordsGetSourcePkg},
+ {"source_ver",PkgRecordsGetSourceVer},
#ifdef COMPAT_0_7
{"FileName",PkgRecordsGetFileName},
{"Homepage",PkgRecordsGetHomepage},
diff --git a/python/pkgsrcrecords.cc b/python/pkgsrcrecords.cc
index 2a8b7bab..dea7ff37 100644
--- a/python/pkgsrcrecords.cc
+++ b/python/pkgsrcrecords.cc
@@ -173,7 +173,7 @@ static PyObject *PkgSrcRecordsGetBuildDepends(PyObject *Self,void*) {
static PyGetSetDef PkgSrcRecordsGetSet[] = {
{"binaries",PkgSrcRecordsGetBinaries},
- {"builddepends",PkgSrcRecordsGetBuildDepends},
+ {"build_depends",PkgSrcRecordsGetBuildDepends},
{"files",PkgSrcRecordsGetFiles},
{"index",PkgSrcRecordsGetIndex},
{"maintainer",PkgSrcRecordsGetMaintainer},
diff --git a/python/tag.cc b/python/tag.cc
index 846123ba..c30adb0a 100644
--- a/python/tag.cc
+++ b/python/tag.cc
@@ -378,7 +378,7 @@ static PyMethodDef TagSecMethods[] =
{
// Query
{"find",TagSecFind,METH_VARARGS,doc_Find},
- {"findflag",TagSecFindFlag,METH_VARARGS,doc_FindFlag},
+ {"find_flag",TagSecFindFlag,METH_VARARGS,doc_FindFlag},
{"bytes",TagSecBytes,METH_VARARGS,doc_Bytes},
#ifdef COMPAT_0_7
{"Find",TagSecFind,METH_VARARGS,doc_Find},