python: Return bool instead of int to Python where possible, looks better.

16 files changed, 61 insertions, 60 deletions

diff --git a/debian/changelog b/debian/changelog
index a685e648..29606cb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ python-apt (0.7.94.3) UNRELEASED; urgency=low
   * apt/package.py:
     - Decode using utf-8 in installed_files (LP: #407953).
     - Fix fetch_source() to work when source name = binary name (LP: #552400).
+  * python:
+    - Return bool instead of int to Python where possible, looks better.
   * python/cache.cc:
     - Check that 2nd argument to Cache.update() really is a SourceList object.
     - Fix PackageFile.not_automatic to use NotAutomatic instead of NotSource.
diff --git a/python/apt_instmodule.cc b/python/apt_instmodule.cc
index 2721509e..b1038474 100644
--- a/python/apt_instmodule.cc
+++ b/python/apt_instmodule.cc
@@ -102,7 +102,7 @@ static PyObject *debExtractArchive(PyObject *Self,PyObject *Args)
       if (_error->PendingError() == true) {
 	 if (Rootdir != NULL)
 	    chdir (cwd);
-	 return HandleErrors(Py_BuildValue("b",false));
+	 return HandleErrors();
       }
 
       // extracts relative to the current dir
@@ -112,9 +112,9 @@ static PyObject *debExtractArchive(PyObject *Self,PyObject *Args)
       if (Rootdir != NULL)
 	 chdir (cwd);
       if (res == false)
-	 return HandleErrors(Py_BuildValue("b",res));
+	 return HandleErrors(PyBool_FromLong(res));
    }
-   return HandleErrors(Py_BuildValue("b",res));
+   return HandleErrors(PyBool_FromLong(res));
 }
 									/*}}}*/
 // arFindMember - Find member in AR archive              		/*{{{*/
@@ -136,12 +136,12 @@ static PyObject *arCheckMember(PyObject *Self,PyObject *Args)
    FileFd Fd(fileno,false);
    ARArchive AR(Fd);
    if (_error->PendingError() == true)
-      return HandleErrors(Py_BuildValue("b",res));
+      return HandleErrors();
 
    if(AR.FindMember(Member) != 0)
       res = true;
 
-   return HandleErrors(Py_BuildValue("b",res));
+   return HandleErrors(PyBool_FromLong(res));
 }
 									/*}}}*/
 
diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc
index 3d40832b..e2be4f1d 100644
--- a/python/apt_pkgmodule.cc
+++ b/python/apt_pkgmodule.cc
@@ -432,7 +432,7 @@ static PyObject *PkgSystemLock(PyObject *Self,PyObject *Args)
    bool res = _system->Lock();
 
    Py_INCREF(Py_None);
-   return HandleErrors(Py_BuildValue("b", res));
+   return HandleErrors(PyBool_FromLong(res));
 }
 
 static char *doc_PkgSystemUnLock =
@@ -446,7 +446,7 @@ static PyObject *PkgSystemUnLock(PyObject *Self,PyObject *Args)
    bool res = _system->UnLock();
 
    Py_INCREF(Py_None);
-   return HandleErrors(Py_BuildValue("b", res));
+   return HandleErrors(PyBool_FromLong(res));
 }
 
 									/*}}}*/
diff --git a/python/cache.cc b/python/cache.cc
index 93f9d3af..99d06184 100644
--- a/python/cache.cc
+++ b/python/cache.cc
@@ -99,7 +99,7 @@ static PyObject *PkgCacheUpdate(PyObject *Self,PyObject *Args)
    pkgSourceList *source = GetCpp<pkgSourceList*>(pySourcesList);
    bool res = ListUpdate(progress, *source, pulseInterval);
 
-   PyObject *PyRes = Py_BuildValue("b", res);
+   PyObject *PyRes = PyBool_FromLong(res);
    return HandleErrors(PyRes);
 }
 
@@ -485,9 +485,9 @@ MkGet(PackageGetInstState,Py_BuildValue("i",Pkg->InstState))
 MkGet(PackageGetCurrentState,Py_BuildValue("i",Pkg->CurrentState))
 MkGet(PackageGetID,Py_BuildValue("i",Pkg->ID))
 #
-MkGet(PackageGetAuto,Py_BuildValue("i",(Pkg->Flags & pkgCache::Flag::Auto) != 0))
-MkGet(PackageGetEssential,Py_BuildValue("i",(Pkg->Flags & pkgCache::Flag::Essential) != 0))
-MkGet(PackageGetImportant,Py_BuildValue("i",(Pkg->Flags & pkgCache::Flag::Important) != 0))
+MkGet(PackageGetAuto,PyBool_FromLong((Pkg->Flags & pkgCache::Flag::Auto) != 0))
+MkGet(PackageGetEssential,PyBool_FromLong((Pkg->Flags & pkgCache::Flag::Essential) != 0))
+MkGet(PackageGetImportant,PyBool_FromLong((Pkg->Flags & pkgCache::Flag::Important) != 0))
 #undef MkGet
 #undef Owner
 
@@ -797,7 +797,7 @@ static PyObject *VersionGetPriorityStr(PyObject *Self, void*) {
    return Safe_FromString(Version_GetVer(Self).PriorityType());
 }
 static PyObject *VersionGetDownloadable(PyObject *Self, void*) {
-   return Py_BuildValue("b",Version_GetVer(Self).Downloadable());
+   return PyBool_FromLong(Version_GetVer(Self).Downloadable());
 }
 static PyObject *VersionGetTranslatedDescription(PyObject *Self, void*) {
    pkgCache::VerIterator &Ver = GetCpp<pkgCache::VerIterator>(Self);
@@ -817,9 +817,9 @@ static PyObject *VersionGetIsTrusted(PyObject *Self, void*) {
       {
 	 pkgIndexFile *index;
 	 if(Sources.FindIndex(i.File(), index) && !index->IsTrusted())
-	    return Py_BuildValue("b", false);
+	    Py_RETURN_FALSE;
       }
-      return Py_BuildValue("b", true);
+      Py_RETURN_TRUE;
    }
 }
 #endif
@@ -961,7 +961,7 @@ static PyObject *PackageFile_GetSize(PyObject *Self,void*)
 static PyObject *PackageFile_GetNotSource(PyObject *Self,void*)
 {
     pkgCache::PkgFileIterator &File = GetCpp<pkgCache::PkgFileIterator>(Self);
-    return Py_BuildValue("i",(File->Flags & pkgCache::Flag::NotSource) != 0);
+    return PyBool_FromLong((File->Flags & pkgCache::Flag::NotSource) != 0);
 }
 static PyObject *PackageFile_GetNotAutomatic(PyObject *Self,void*)
 {
diff --git a/python/cdrom.cc b/python/cdrom.cc
index 9eae49dc..022a4b00 100644
--- a/python/cdrom.cc
+++ b/python/cdrom.cc
@@ -94,7 +94,8 @@ static PyObject *cdrom_ident_old(PyObject *Self,PyObject *Args)
     string ident;
     bool res = Cdrom.Ident(ident, &progress);
 
-    PyObject *result = Py_BuildValue("(bs)", res, ident.c_str());
+    PyObject *boolres = PyBool_FromLong(res);
+    PyObject *result = Py_BuildValue("(Os)", boolres, ident.c_str());
 
     return HandleErrors(result);
 }
diff --git a/python/configuration.cc b/python/configuration.cc
index 299e06ec..1b5010ab 100644
--- a/python/configuration.cc
+++ b/python/configuration.cc
@@ -80,7 +80,7 @@ static PyObject *CnfFindB(PyObject *Self,PyObject *Args)
    int Default = 0;
    if (PyArg_ParseTuple(Args,"s|i",&Name,&Default) == 0)
       return 0;
-   return Py_BuildValue("i",(int)GetSelf(Self).FindB(Name,(Default == 0?false:true)));
+   return PyBool_FromLong(GetSelf(Self).FindB(Name,(Default == 0?false:true)));
 }
 
 static char *doc_Set = "Set(Name,Value) -> None";
@@ -102,7 +102,7 @@ static PyObject *CnfExists(PyObject *Self,PyObject *Args)
    char *Name = 0;
    if (PyArg_ParseTuple(Args,"s",&Name) == 0)
       return 0;
-   return Py_BuildValue("i",(int)GetSelf(Self).Exists(Name));
+   return PyBool_FromLong((int)GetSelf(Self).Exists(Name));
 }
 
 static int CnfContains(PyObject *Self,PyObject *Arg)
diff --git a/python/depcache.cc b/python/depcache.cc
index 8b4e02b5..dc6a999b 100644
--- a/python/depcache.cc
+++ b/python/depcache.cc
@@ -157,18 +157,18 @@ static PyObject *PkgDepCacheCommit(PyObject *Self,PyObject *Args)
       // fail if something else went wrong
       //FIXME: make this more flexible, e.g. with a failedDl handler
       if(Failed)
-	 return Py_BuildValue("b", false);
+	 Py_RETURN_FALSE;
       _system->UnLock(true);
 
       pkgPackageManager::OrderResult Res = iprogress.Run(PM);
       //std::cout << "iprogress.Run() returned: " << (int)Res << std::endl;
 
       if (Res == pkgPackageManager::Failed || _error->PendingError() == true) {
-	 return HandleErrors(Py_BuildValue("b", false));
+	 return HandleErrors(PyBool_FromLong(false));
       }
       if (Res == pkgPackageManager::Completed) {
 	 //std::cout << "iprogress.Run() returned Completed " << std::endl;
-	 return Py_BuildValue("b", true);
+     Py_RETURN_TRUE;
       }
 
       //std::cout << "looping again, install unfinished" << std::endl;
@@ -176,7 +176,7 @@ static PyObject *PkgDepCacheCommit(PyObject *Self,PyObject *Args)
       // Reload the fetcher object and loop again for media swapping
       Fetcher.Shutdown();
       if (PM->GetArchives(&Fetcher,&List,&Recs) == false) {
-	 return Py_BuildValue("b", false);
+	 Py_RETURN_FALSE;
       }
       _system->Lock();
    }
@@ -196,11 +196,11 @@ static PyObject *PkgDepCacheSetCandidateVer(PyObject *Self,PyObject *Args)
 
    pkgCache::VerIterator &I = GetCpp<pkgCache::VerIterator>(VersionObj);
    if(I.end()) {
-      return HandleErrors(Py_BuildValue("b",false));
+      return HandleErrors(PyBool_FromLong(false));
    }
    depcache->SetCandidateVersion(I);
 
-   return HandleErrors(Py_BuildValue("b",true));
+   return HandleErrors(PyBool_FromLong(true));
 }
 
 static PyObject *PkgDepCacheGetCandidateVer(PyObject *Self,PyObject *Args)
@@ -241,7 +241,7 @@ static PyObject *PkgDepCacheUpgrade(PyObject *Self,PyObject *Args)
    Py_END_ALLOW_THREADS
 
    Py_INCREF(Py_None);
-   return HandleErrors(Py_BuildValue("b",res));
+   return HandleErrors(PyBool_FromLong(res));
 }
 
 static PyObject *PkgDepCacheMinimizeUpgrade(PyObject *Self,PyObject *Args)
@@ -257,7 +257,7 @@ static PyObject *PkgDepCacheMinimizeUpgrade(PyObject *Self,PyObject *Args)
    Py_END_ALLOW_THREADS
 
    Py_INCREF(Py_None);
-   return HandleErrors(Py_BuildValue("b",res));
+   return HandleErrors(PyBool_FromLong(res));
 }
 
 
@@ -291,7 +291,7 @@ static PyObject *PkgDepCacheFixBroken(PyObject *Self,PyObject *Args)
    res &=pkgFixBroken(*depcache);
    res &=pkgMinimizeUpgrade(*depcache);
 
-   return HandleErrors(Py_BuildValue("b",res));
+   return HandleErrors(PyBool_FromLong(res));
 }
 
 
@@ -392,7 +392,7 @@ static PyObject *PkgDepCacheIsUpgradable(PyObject *Self,PyObject *Args)
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
    pkgDepCache::StateCache &state = (*depcache)[Pkg];
 
-   return HandleErrors(Py_BuildValue("b",state.Upgradable()));
+   return HandleErrors(PyBool_FromLong(state.Upgradable()));
 }
 
 static PyObject *PkgDepCacheIsGarbage(PyObject *Self,PyObject *Args)
@@ -406,7 +406,7 @@ static PyObject *PkgDepCacheIsGarbage(PyObject *Self,PyObject *Args)
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
    pkgDepCache::StateCache &state = (*depcache)[Pkg];
 
-   return HandleErrors(Py_BuildValue("b",state.Garbage));
+   return HandleErrors(PyBool_FromLong(state.Garbage));
 }
 
 static PyObject *PkgDepCacheIsAutoInstalled(PyObject *Self,PyObject *Args)
@@ -420,7 +420,7 @@ static PyObject *PkgDepCacheIsAutoInstalled(PyObject *Self,PyObject *Args)
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
    pkgDepCache::StateCache &state = (*depcache)[Pkg];
 
-   return HandleErrors(Py_BuildValue("b",state.Flags & pkgCache::Flag::Auto));
+   return HandleErrors(PyBool_FromLong(state.Flags & pkgCache::Flag::Auto));
 }
 
 static PyObject *PkgDepCacheIsNowBroken(PyObject *Self,PyObject *Args)
@@ -434,7 +434,7 @@ static PyObject *PkgDepCacheIsNowBroken(PyObject *Self,PyObject *Args)
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
    pkgDepCache::StateCache &state = (*depcache)[Pkg];
 
-   return HandleErrors(Py_BuildValue("b",state.NowBroken()));
+   return HandleErrors(PyBool_FromLong(state.NowBroken()));
 }
 
 static PyObject *PkgDepCacheIsInstBroken(PyObject *Self,PyObject *Args)
@@ -448,7 +448,7 @@ static PyObject *PkgDepCacheIsInstBroken(PyObject *Self,PyObject *Args)
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
    pkgDepCache::StateCache &state = (*depcache)[Pkg];
 
-   return HandleErrors(Py_BuildValue("b",state.InstBroken()));
+   return HandleErrors(PyBool_FromLong(state.InstBroken()));
 }
 
 
@@ -463,7 +463,7 @@ static PyObject *PkgDepCacheMarkedInstall(PyObject *Self,PyObject *Args)
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
    pkgDepCache::StateCache &state = (*depcache)[Pkg];
 
-   return HandleErrors(Py_BuildValue("b",state.NewInstall()));
+   return HandleErrors(PyBool_FromLong(state.NewInstall()));
 }
 
 
@@ -478,7 +478,7 @@ static PyObject *PkgDepCacheMarkedUpgrade(PyObject *Self,PyObject *Args)
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
    pkgDepCache::StateCache &state = (*depcache)[Pkg];
 
-   return HandleErrors(Py_BuildValue("b",state.Upgrade()));
+   return HandleErrors(PyBool_FromLong(state.Upgrade()));
 }
 
 static PyObject *PkgDepCacheMarkedDelete(PyObject *Self,PyObject *Args)
@@ -492,7 +492,7 @@ static PyObject *PkgDepCacheMarkedDelete(PyObject *Self,PyObject *Args)
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
    pkgDepCache::StateCache &state = (*depcache)[Pkg];
 
-   return HandleErrors(Py_BuildValue("b",state.Delete()));
+   return HandleErrors(PyBool_FromLong(state.Delete()));
 }
 
 static PyObject *PkgDepCacheMarkedKeep(PyObject *Self,PyObject *Args)
@@ -506,7 +506,7 @@ static PyObject *PkgDepCacheMarkedKeep(PyObject *Self,PyObject *Args)
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
    pkgDepCache::StateCache &state = (*depcache)[Pkg];
 
-   return HandleErrors(Py_BuildValue("b",state.Keep()));
+   return HandleErrors(PyBool_FromLong(state.Keep()));
 }
 
 static PyObject *PkgDepCacheMarkedDowngrade(PyObject *Self,PyObject *Args)
@@ -520,7 +520,7 @@ static PyObject *PkgDepCacheMarkedDowngrade(PyObject *Self,PyObject *Args)
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
    pkgDepCache::StateCache &state = (*depcache)[Pkg];
 
-   return HandleErrors(Py_BuildValue("b",state.Downgrade()));
+   return HandleErrors(PyBool_FromLong(state.Downgrade()));
 }
 
 static PyObject *PkgDepCacheMarkedReinstall(PyObject *Self,PyObject *Args)
@@ -536,7 +536,7 @@ static PyObject *PkgDepCacheMarkedReinstall(PyObject *Self,PyObject *Args)
 
    bool res = state.Install() && (state.iFlags & pkgDepCache::ReInstall);
 
-   return HandleErrors(Py_BuildValue("b",res));
+   return HandleErrors(PyBool_FromLong(res));
 }
 
 
@@ -748,7 +748,7 @@ static PyObject *PkgProblemResolverResolve(PyObject *Self,PyObject *Args)
    res = fixer->Resolve(brokenFix);
    Py_END_ALLOW_THREADS
 
-   return HandleErrors(Py_BuildValue("b", res));
+   return HandleErrors(PyBool_FromLong(res));
 }
 
 static PyObject *PkgProblemResolverResolveByKeep(PyObject *Self,PyObject *Args)
@@ -762,7 +762,7 @@ static PyObject *PkgProblemResolverResolveByKeep(PyObject *Self,PyObject *Args)
    res = fixer->ResolveByKeep();
    Py_END_ALLOW_THREADS
 
-   return HandleErrors(Py_BuildValue("b", res));
+   return HandleErrors(PyBool_FromLong(res));
 }
 
 static PyObject *PkgProblemResolverProtect(PyObject *Self,PyObject *Args)
diff --git a/python/indexfile.cc b/python/indexfile.cc
index c6d0b1cc..524e59a4 100644
--- a/python/indexfile.cc
+++ b/python/indexfile.cc
@@ -39,16 +39,16 @@ static PyObject *IndexFileGetDescribe(PyObject *Self,void*) {
    return Safe_FromString(File->Describe().c_str());
 }
 static PyObject *IndexFileGetExists(PyObject *Self,void*) {
-   return Py_BuildValue("i",(File->Exists()));
+   return PyBool_FromLong((File->Exists()));
 }
 static PyObject *IndexFileGetHasPackages(PyObject *Self,void*) {
-   return Py_BuildValue("i",(File->HasPackages()));
+   return PyBool_FromLong((File->HasPackages()));
 }
 static PyObject *IndexFileGetSize(PyObject *Self,void*) {
    return Py_BuildValue("i",(File->Size()));
 }
 static PyObject *IndexFileGetIsTrusted(PyObject *Self,void*) {
-   return Py_BuildValue("i",(File->IsTrusted()));
+   return PyBool_FromLong((File->IsTrusted()));
 }
 #undef File
 
diff --git a/python/indexrecords.cc b/python/indexrecords.cc
index 80960160..ac4a7c2e 100644
--- a/python/indexrecords.cc
+++ b/python/indexrecords.cc
@@ -41,7 +41,7 @@ static PyObject *indexrecords_load(PyObject *self,PyObject *args)
     if (PyArg_ParseTuple(args, "s", &filename) == 0)
         return 0;
     indexRecords *records = GetCpp<indexRecords*>(self);
-    return HandleErrors(Py_BuildValue("i", records->Load(filename)));
+    return HandleErrors(PyBool_FromLong(records->Load(filename)));
 }
 
 static char *indexrecords_lookup_doc = "lookup(metakey)\n\n"
diff --git a/python/metaindex.cc b/python/metaindex.cc
index 2dcade7d..cb066980 100644
--- a/python/metaindex.cc
+++ b/python/metaindex.cc
@@ -27,7 +27,7 @@ static PyObject *MetaIndexGetDist(PyObject *Self,void*) {
 
 static PyObject *MetaIndexGetIsTrusted(PyObject *Self,void*) {
     metaIndex *meta = GetCpp<metaIndex*>(Self);
-    return Py_BuildValue("i",(meta->IsTrusted()));
+    return PyBool_FromLong((meta->IsTrusted()));
 }
 
 static PyObject *MetaIndexGetIndexFiles(PyObject *Self,void*) {
diff --git a/python/pkgmanager.cc b/python/pkgmanager.cc
index 2fda14ee..3a40655a 100644
--- a/python/pkgmanager.cc
+++ b/python/pkgmanager.cc
@@ -65,7 +65,7 @@ static PyObject *PkgManagerGetArchives(PyObject *Self,PyObject *Args)
    bool res = pm->GetArchives(s_fetcher, s_list,
 			      &s_records.Records);
 
-   return HandleErrors(Py_BuildValue("b",res));
+   return HandleErrors(PyBool_FromLong(res));
 }
 
 static PyObject *PkgManagerDoInstall(PyObject *Self,PyObject *Args)
@@ -92,7 +92,7 @@ static PyObject *PkgManagerFixMissing(PyObject *Self,PyObject *Args)
 
    bool res = pm->FixMissing();
 
-   return HandleErrors(Py_BuildValue("b",res));
+   return HandleErrors(PyBool_FromLong(res));
 }
 
 static PyMethodDef PkgManagerMethods[] =
diff --git a/python/pkgrecords.cc b/python/pkgrecords.cc
index 0e00edcd..a53af394 100644
--- a/python/pkgrecords.cc
+++ b/python/pkgrecords.cc
@@ -44,7 +44,7 @@ static PyObject *PkgRecordsLookup(PyObject *Self,PyObject *Args)
    Struct.Last = &Struct.Records.Lookup(pkgCache::VerFileIterator(*Cache,Cache->VerFileP+Index));
 
    // always return true (to make it consistent with the pkgsrcrecords object
-   return Py_BuildValue("i", 1);
+   return PyBool_FromLong(1);
 }
 
 static PyMethodDef PkgRecordsMethods[] =
diff --git a/python/pkgsrcrecords.cc b/python/pkgsrcrecords.cc
index 95f35f23..2bc75687 100644
--- a/python/pkgsrcrecords.cc
+++ b/python/pkgsrcrecords.cc
@@ -50,7 +50,7 @@ static PyObject *PkgSrcRecordsLookup(PyObject *Self,PyObject *Args)
       return HandleErrors(Py_None);
    }
 
-   return Py_BuildValue("i", 1);
+   return PyBool_FromLong(1);
 }
 
 static char *doc_PkgSrcRecordsRestart = "Start Lookup from the beginning";
diff --git a/python/sourcelist.cc b/python/sourcelist.cc
index 6184fee3..e42f6bb8 100644
--- a/python/sourcelist.cc
+++ b/python/sourcelist.cc
@@ -53,7 +53,7 @@ static PyObject *PkgSourceListReadMainList(PyObject *Self,PyObject *Args)
    pkgSourceList *list = GetCpp<pkgSourceList*>(Self);
    bool res = list->ReadMainList();
 
-   return HandleErrors(Py_BuildValue("b",res));
+   return HandleErrors(PyBool_FromLong(res));
 }
 
 static char *doc_PkgSourceListGetIndexes = "Load the indexes into the fetcher";
@@ -69,7 +69,7 @@ static PyObject *PkgSourceListGetIndexes(PyObject *Self,PyObject *Args)
    pkgAcquire *fetcher = GetCpp<pkgAcquire*>(pyFetcher);
    bool res = list->GetIndexes(fetcher, all);
 
-   return HandleErrors(Py_BuildValue("b",res));
+   return HandleErrors(PyBool_FromLong(res));
 }
 
 static PyMethodDef PkgSourceListMethods[] =
diff --git a/python/string.cc b/python/string.cc
index b95ee3eb..6a1ce4e2 100644
--- a/python/string.cc
+++ b/python/string.cc
@@ -116,7 +116,7 @@ PyObject *StrCheckDomainList(PyObject *Self,PyObject *Args)
    char *List = 0;
    if (PyArg_ParseTuple(Args,"ss",&Host,&List) == 0)
       return 0;
-   return Py_BuildValue("i",CheckDomainList(Host,List));
+   return PyBool_FromLong(CheckDomainList(Host,List));
 }
 
 									/*}}}*/
diff --git a/python/tag.cc b/python/tag.cc
index c7edcb31..c323aa42 100644
--- a/python/tag.cc
+++ b/python/tag.cc
@@ -144,7 +144,7 @@ static PyObject *TagSecFindFlag(PyObject *Self,PyObject *Args)
       Py_INCREF(Py_None);
       return Py_None;
    }
-   return Py_BuildValue("i",Flag);
+   return PyBool_FromLong(Flag);
 }
 
 // Map access, operator []
@@ -209,9 +209,7 @@ static PyObject *TagSecExists(PyObject *Self,PyObject *Args)
 
    const char *Start;
    const char *Stop;
-   if (GetCpp<pkgTagSection>(Self).Find(Name,Start,Stop) == false)
-      return Py_BuildValue("i",0);
-   return Py_BuildValue("i",1);
+   return PyBool_FromLong(GetCpp<pkgTagSection>(Self).Find(Name,Start,Stop));
 }
 #endif
 
@@ -253,9 +251,9 @@ static PyObject *TagFileStep(PyObject *Self,PyObject *Args)
 
    TagFileData &Obj = *(TagFileData *)Self;
    if (Obj.Object.Step(Obj.Section->Object) == false)
-      return HandleErrors(Py_BuildValue("i",0));
+      return HandleErrors(PyBool_FromLong(0));
 
-   return HandleErrors(Py_BuildValue("i",1));
+   return HandleErrors(PyBool_FromLong(1));
 }
 
 // TagFile Wrappers							/*{{{*/
@@ -313,9 +311,9 @@ static PyObject *TagFileJump(PyObject *Self,PyObject *Args)
 
    TagFileData &Obj = *(TagFileData *)Self;
    if (Obj.Object.Jump(Obj.Section->Object,Offset) == false)
-      return HandleErrors(Py_BuildValue("i",0));
+      return HandleErrors(PyBool_FromLong(0));
 
-   return HandleErrors(Py_BuildValue("i",1));
+   return HandleErrors(PyBool_FromLong(1));
 }
 									/*}}}*/
 // ParseSection - Parse a single section from a tag file		/*{{{*/