Merge git://anonscm.debian.org/apt/python-apt

Conflicts:
	debian/changelog
	python/apt_pkgmodule.cc

1 files changed, 61 insertions, 61 deletions

diff --git a/doc/examples/depcache.py b/doc/examples/depcache.py
index 858e45a4..8e33e98b 100644
--- a/doc/examples/depcache.py
+++ b/doc/examples/depcache.py
@@ -10,7 +10,7 @@ apt_pkg.init()
 
 progress = TextProgress()
 cache = apt_pkg.Cache(progress)
-print "Available packages: %s " % cache.PackageCount
+print "Available packages: %s " % cache.package_count
 
 iter = cache["base-config"]
 print "example package iter: %s" % iter
@@ -18,90 +18,90 @@ print "example package iter: %s" % iter
 # get depcache
 print "\n\n depcache"
 depcache = apt_pkg.DepCache(cache)
-depcache.ReadPinFile()
+depcache.read_pinfile()
 # init is needed after the creation/pin file reading
-depcache.Init(progress)
+depcache.init(progress)
 print "got a depcache: %s " % depcache
-print "Marked for install: %s " % depcache.InstCount
+print "Marked for install: %s " % depcache.inst_count
 
 print "\n\n Reinit"
-depcache.Init(progress)
+depcache.init(progress)
 
 #sys.exit()
 
 
 # get a canidate version
-ver= depcache.GetCandidateVer(iter)
+ver = depcache.get_candidate_ver(iter)
 print "Candidate version: %s " % ver
 
 print "\n\nQuerry interface"
-print "%s.IsUpgradable(): %s" % (iter.Name, depcache.IsUpgradable(iter))
+print "%s.is_upgradable(): %s" % (iter.name, depcache.is_upgradable(iter))
 
 print "\nMarking interface"
-print "Marking '%s' for install" % iter.Name
-depcache.MarkInstall(iter)
-print "Install count: %s " % depcache.InstCount
-print "%s.MarkedInstall(): %s" % (iter.Name, depcache.MarkedInstall(iter))
-print "%s.MarkedUpgrade(): %s" % (iter.Name, depcache.MarkedUpgrade(iter))
-print "%s.MarkedDelete(): %s" % (iter.Name, depcache.MarkedDelete(iter))
+print "Marking '%s' for install" % iter.name
+depcache.mark_install(iter)
+print "Install count: %s " % depcache.inst_count
+print "%s.marked_install(): %s" % (iter.name, depcache.marked_install(iter))
+print "%s.marked_upgrade(): %s" % (iter.name, depcache.marked_upgrade(iter))
+print "%s.marked_delete(): %s" % (iter.name, depcache.marked_delete(iter))
 
-print "Marking %s for delete" % iter.Name
-depcache.MarkDelete(iter)
-print "DelCount: %s " % depcache.DelCount
-print "%s.MarkedDelete(): %s" % (iter.Name, depcache.MarkedDelete(iter))
+print "Marking %s for delete" % iter.name
+depcache.mark_delete(iter)
+print "del_count: %s " % depcache.del_count
+print "%s.marked_delete(): %s" % (iter.name, depcache.marked_delete(iter))
 
 
 iter = cache["3dchess"]
-print "\nMarking '%s' for install" % iter.Name
-depcache.MarkInstall(iter)
-print "Install count: %s " % depcache.InstCount
-print "%s.MarkedInstall(): %s" % (iter.Name, depcache.MarkedInstall(iter))
-print "%s.MarkedUpgrade(): %s" % (iter.Name, depcache.MarkedUpgrade(iter))
-print "%s.MarkedDelete(): %s" % (iter.Name, depcache.MarkedDelete(iter))
+print "\nMarking '%s' for install" % iter.name
+depcache.mark_install(iter)
+print "Install count: %s " % depcache.inst_count
+print "%s.marked_install(): %s" % (iter.name, depcache.marked_install(iter))
+print "%s.marked_upgrade(): %s" % (iter.name, depcache.marked_upgrade(iter))
+print "%s.marked_delete(): %s" % (iter.name, depcache.marked_delete(iter))
 
-print "Marking %s for keep" % iter.Name
-depcache.MarkKeep(iter)
-print "Install: %s " % depcache.InstCount
+print "Marking %s for keep" % iter.name
+depcache.mark_keep(iter)
+print "Install: %s " % depcache.inst_count
 
 iter = cache["synaptic"]
-print "\nMarking '%s' for install" % iter.Name
-depcache.MarkInstall(iter)
-print "Install: %s " % depcache.InstCount
-print "Broken count: %s" % depcache.BrokenCount
-print "FixBroken() "
-depcache.FixBroken()
-print "Broken count: %s" % depcache.BrokenCount
-
-print "\nPerforming Upgrade"
-depcache.Upgrade()
-print "Keep: %s " % depcache.KeepCount
-print "Install: %s " % depcache.InstCount
-print "Delete: %s " % depcache.DelCount
-print "UsrSize: %s " % apt_pkg.SizeToStr(depcache.UsrSize)
-print "DebSize: %s " % apt_pkg.SizeToStr(depcache.DebSize)
-
-for pkg in cache.Packages:
-    if pkg.CurrentVer is not None and not depcache.MarkedInstall(pkg) \
-        and depcache.IsUpgradable(pkg):
-        print "Upgrade didn't upgrade (kept): %s" % pkg.Name
+print "\nMarking '%s' for install" % iter.name
+depcache.mark_install(iter)
+print "Install: %s " % depcache.inst_count
+print "Broken count: %s" % depcache.broken_count
+print "fix_broken() "
+depcache.fix_broken()
+print "Broken count: %s" % depcache.broken_count
+
+print "\nPerforming upgrade"
+depcache.upgrade()
+print "Keep: %s " % depcache.keep_count
+print "Install: %s " % depcache.inst_count
+print "Delete: %s " % depcache.del_count
+print "usr_size: %s " % apt_pkg.size_to_str(depcache.usr_size)
+print "deb_size: %s " % apt_pkg.size_to_str(depcache.deb_size)
+
+for pkg in cache.packages:
+    if pkg.current_ver is not None and not depcache.marked_install(pkg) \
+        and depcache.is_upgradable(pkg):
+        print "upgrade didn't upgrade (kept): %s" % pkg.name
 
 
 print "\nPerforming DistUpgrade"
-depcache.Upgrade(True)
-print "Keep: %s " % depcache.KeepCount
-print "Install: %s " % depcache.InstCount
-print "Delete: %s " % depcache.DelCount
-print "UsrSize: %s " % apt_pkg.SizeToStr(depcache.UsrSize)
-print "DebSize: %s " % apt_pkg.SizeToStr(depcache.DebSize)
+depcache.upgrade(True)
+print "Keep: %s " % depcache.keep_count
+print "Install: %s " % depcache.inst_count
+print "Delete: %s " % depcache.del_count
+print "usr_size: %s " % apt_pkg.size_to_str(depcache.usr_size)
+print "deb_size: %s " % apt_pkg.size_to_str(depcache.deb_size)
 
 # overview about what would happen
-for pkg in cache.Packages:
-    if depcache.MarkedInstall(pkg):
-        if pkg.CurrentVer is not None:
-            print "Marked upgrade: %s " % pkg.Name
+for pkg in cache.packages:
+    if depcache.marked_install(pkg):
+        if pkg.current_ver is not None:
+            print "Marked upgrade: %s " % pkg.name
         else:
-            print "Marked install: %s" % pkg.Name
-    elif depcache.MarkedDelete(pkg):
-        print "Marked delete: %s" % pkg.Name
-    elif depcache.MarkedKeep(pkg):
-        print "Marked keep: %s" % pkg.Name
+            print "Marked install: %s" % pkg.name
+    elif depcache.marked_delete(pkg):
+        print "Marked delete: %s" % pkg.name
+    elif depcache.marked_keep(pkg):
+        print "Marked keep: %s" % pkg.name