* apt/: Adjust modules to use Package.{installed,candidate}.*

3 files changed, 17 insertions, 18 deletions

diff --git a/apt/cache.py b/apt/cache.py
index 0065d14c..0c729787 100644
--- a/apt/cache.py
+++ b/apt/cache.py
@@ -152,7 +152,7 @@ class Cache(object):
         """Return the packages not downloadable packages in reqreinst state."""
         reqreinst = set()
         for pkg in self:
-            if (not pkg.candidateDownloadable and
+            if (not pkg.candidate.downloadable and
                 (pkg._pkg.InstState == apt_pkg.InstStateReInstReq or
                  pkg._pkg.InstState == apt_pkg.InstStateHoldReInstReq)):
                 reqreinst.add(pkg.name)
diff --git a/apt/debfile.py b/apt/debfile.py
index 820326b9..c550d766 100644
--- a/apt/debfile.py
+++ b/apt/debfile.py
@@ -108,9 +108,8 @@ class DebPackage(object):
                             return True
                 continue
 
-            inst = self._cache[depname]
-            instver = inst.installedVersion
-            if instver is not None and apt_pkg.CheckDep(instver, oper, ver):
+            inst = self._cache[depname].installed
+            if inst is not None and apt_pkg.CheckDep(inst.version, oper, ver):
                 return True
         return False
 
@@ -163,9 +162,9 @@ class DebPackage(object):
 
         pkg = self._cache[pkgname]
         if pkg.isInstalled:
-            pkgver = pkg.installedVersion
+            pkgver = pkg.installed.version
         elif pkg.markedInstall:
-            pkgver = pkg.candidateVersion
+            pkgver = pkg.candidate.version
         else:
             return False
         #print "pkg: %s" % pkgname
@@ -258,9 +257,9 @@ class DebPackage(object):
         self._dbg(3, "replacesPkg() %s %s %s" % (pkgname, oper, ver))
         pkg = self._cache[pkgname]
         if pkg.isInstalled:
-            pkgver = pkg.installedVersion
+            pkgver = pkg.installed.version
         elif pkg.markedInstall:
-            pkgver = pkg.candidateVersion
+            pkgver = pkg.candidate.version
         else:
             pkgver = None
         for or_group in self.replaces:
@@ -297,10 +296,10 @@ class DebPackage(object):
         debver = self._sections["Version"]
         self._dbg(1, "debver: %s" % debver)
         if pkgname in self._cache:
-            if use_installed:
-                cachever = self._cache[pkgname].installedVersion
+            if use_installed and self._cache[pkgname].installed:
+                cachever = self._cache[pkgname].installed.version
             else:
-                cachever = self._cache[pkgname].candidateVersion
+                cachever = self._cache[pkgname].candidate.version
             if cachever is not None:
                 cmp = apt_pkg.VersionCompare(cachever, debver)
                 self._dbg(1, "CompareVersion(debver,instver): %s" % cmp)
@@ -405,7 +404,7 @@ class DebPackage(object):
                 # check authentication, one authenticated origin is enough
                 # libapt will skip non-authenticated origins then
                 authenticated = False
-                for origin in pkg.candidateOrigin:
+                for origin in pkg.candidate.origins:
                     authenticated |= origin.trusted
                 if not authenticated:
                     unauthenticated.append(pkg.name)
diff --git a/apt/package.py b/apt/package.py
index a44eb2a6..c9275360 100644
--- a/apt/package.py
+++ b/apt/package.py
@@ -635,11 +635,11 @@ class Package(object):
             return self._changelog
 
         if uri is None:
-            if self.candidateOrigin[0].origin == "Debian":
+            if self.candidate.origins[0].origin == "Debian":
                 uri = "http://packages.debian.org/changelogs/pool" \
                       "/%(src_section)s/%(prefix)s/%(src_pkg)s" \
                       "/%(src_pkg)s_%(src_ver)s/changelog"
-            elif self.candidateOrigin[0].origin == "Ubuntu":
+            elif self.candidate.origins[0].origin == "Ubuntu":
                 uri = "http://changelogs.ubuntu.com/changelogs/pool" \
                       "/%(src_section)s/%(prefix)s/%(src_pkg)s" \
                       "/%(src_pkg)s_%(src_ver)s/changelog"
@@ -647,7 +647,7 @@ class Package(object):
                 return _("The list of changes is not available")
 
         # get the src package name
-        src_pkg = self.sourcePackageName
+        src_pkg = self.candidate.source_name
 
         # assume "main" section
         src_section = "main"
@@ -655,8 +655,8 @@ class Package(object):
         section = self._depcache.GetCandidateVer(self._pkg).Section
 
         # get the source version, start with the binaries version
-        bin_ver = self.candidateVersion
-        src_ver = self.candidateVersion
+        bin_ver = self.candidate.version
+        src_ver = self.candidate.version
         #print "bin: %s" % binver
         try:
             # FIXME: This try-statement is too long ...
@@ -726,7 +726,7 @@ class Package(object):
                 if match:
                     # strip epoch from installed version
                     # and from changelog too
-                    installed = self.installedVersion
+                    installed = getattr(self.installed, 'version', None)
                     if installed and ":" in installed:
                         installed = installed.split(":", 1)[1]
                     changelog_ver = match.group(1)