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

Conflicts:
	debian/changelog
	python/apt_pkgmodule.cc

1 files changed, 7 insertions, 7 deletions

diff --git a/doc/examples/all_deps.py b/doc/examples/all_deps.py
index 992e98d8..6ce264bb 100644
--- a/doc/examples/all_deps.py
+++ b/doc/examples/all_deps.py
@@ -6,19 +6,19 @@ import apt
 
 def dependencies(cache, pkg, deps, key="Depends"):
     #print "pkg: %s (%s)" % (pkg.name, deps)
-    candver = cache._depcache.GetCandidateVer(pkg._pkg)
+    candver = cache._depcache.get_candidate_ver(pkg._pkg)
     if candver is None:
         return deps
-    dependslist = candver.DependsList
+    dependslist = candver.depends_list
     if key in dependslist:
         for depVerList in dependslist[key]:
             for dep in depVerList:
-                if dep.TargetPkg.Name in cache:
-                    if pkg.name != dep.TargetPkg.Name and \
-                        not dep.TargetPkg.Name in deps:
-                        deps.add(dep.TargetPkg.Name)
+                if dep.target_pkg.name in cache:
+                    if (pkg.name != dep.target_pkg.name and
+                            dep.target_pkg.name not in deps):
+                        deps.add(dep.target_pkg.name)
                         dependencies(
-                            cache, cache[dep.TargetPkg.Name], deps, key)
+                            cache, cache[dep.target_pkg.name], deps, key)
     return deps