Merge lp:~dstansby-deactivatedaccount/language-selector/bugfix-lp-598619 into lp:language-selector

[David Stansby]

Fixed some deprecated variables

[Sebastien Bacher (seb128)]

Similar changes have landed in 0.6.1 so closing this merge request

Unmerged revisions

371. By David Stansby on 2010-06-27

Fixed deprecated variables

=== modified file 'LanguageSelector/CheckLanguageSupport.py'
--- LanguageSelector/CheckLanguageSupport.py	2010-05-26 14:40:53 +0000
+++ LanguageSelector/CheckLanguageSupport.py	2010-06-27 09:34:31 +0000
@@ -33,7 +33,7 @@
             for x in scanlist:
                 pkg = '%s-%s' % (x, pkgcode)
                 if pkg in self._cache:
-                    if not self._cache[pkg].isInstalled and \
+                    if not self._cache[pkg].is_installed and \
                        not self._cache[pkg].markedInstall:
                         self.missing.add(pkg)
                     else:
@@ -45,23 +45,23 @@
                     if pkg in packages and \
                        pkg in self._cache and \
                        translation in self._cache:
-                        if ((not self._cache[translation].isInstalled and \
+                        if ((not self._cache[translation].is_installed and \
                            not self._cache[translation].markedInstall and \
-                           not self._cache[translation].markedUpgrade) or \
-                           self._cache[translation].markedDelete):
+                           not self._cache[translation].marked_marked_upgrade) or \
+                           self._cache[translation].marked_delete):
                             self.missing.add(translation)
                         else:
                             self.installed.add(translation)
                 else:
                     if pkg in self._cache and \
-                       (self._cache[pkg].isInstalled or \
+                       (self._cache[pkg].is_installed or \
                        self._cache[pkg].markedInstall or \
-                       self._cache[pkg].markedUpgrade) and \
+                       self._cache[pkg].marked_marked_upgrade) and \
                        translation in self._cache:
-                        if ((not self._cache[translation].isInstalled and \
+                        if ((not self._cache[translation].is_installed and \
                            not self._cache[translation].markedInstall and \
-                           not self._cache[translation].markedUpgrade) or \
-                           self._cache[translation].markedDelete):
+                           not self._cache[translation].marked_marked_upgrade) or \
+                           self._cache[translation].marked_delete):
                             self.missing.add(translation)
                         else:
                             self.installed.add(translation)
@@ -69,7 +69,7 @@
         if pkgcode in self.pkg_writing and \
            (pkgcode == self.system_pkgcode or \
            ('language-support-writing-%s' % pkgcode in self._cache and \
-           self._cache['language-support-writing-%s' % pkgcode].isInstalled) or \
+           self._cache['language-support-writing-%s' % pkgcode].is_installed) or \
            ('language-support-writing-%s' % pkgcode in self._cache and \
            self._cache['language-support-writing-%s' % pkgcode].markInstall) or \
            ('language-support-writing-%s' % pkgcode in self._cache and \
@@ -82,24 +82,24 @@
                             if p in packages and \
                                p in self._cache and \
                                pull_pkg in self._cache:
-                                if ((not self._cache[pull_pkg].isInstalled and \
+                                if ((not self._cache[pull_pkg].is_installed and \
                                    not self._cache[pull_pkg].markedInstall and \
-                                   not self._cache[pull_pkg].markedUpgrade) or \
-                                   self._cache[pull_pkg].markedDelete):
+                                   not self._cache[pull_pkg].marked_marked_upgrade) or \
+                                   self._cache[pull_pkg].marked_delete):
                                     self.missing.add(pull_pkg)
                                 else:
                                     self.installed.add(pull_pkg)
                                 break
                         else:
                             if p in self._cache and \
-                               (self._cache[p].isInstalled  or \
+                               (self._cache[p].is_installed  or \
                                self._cache[p].markedInstall or \
-                               self._cache[p].markedUpgrade) and \
+                               self._cache[p].marked_marked_upgrade) and \
                                pull_pkg in self._cache:
-                                if ((not self._cache[pull_pkg].isInstalled and \
+                                if ((not self._cache[pull_pkg].is_installed and \
                                    not self._cache[pull_pkg].markedInstall and \
-                                   not self._cache[pull_pkg].markedUpgrade) or \
-                                   self._cache[pull_pkg].markedDelete):
+                                   not self._cache[pull_pkg].marked_marked_upgrade) or \
+                                   self._cache[pull_pkg].marked_delete):
                                     self.missing.add(pull_pkg)
                                 else:
                                     self.installed.add(pull_pkg)
@@ -109,23 +109,23 @@
                         if pkg in packages and \
                            pkg in self._cache and \
                            pull_pkg in self._cache:
-                            if ((not self._cache[pull_pkg].isInstalled and \
+                            if ((not self._cache[pull_pkg].is_installed and \
                                not self._cache[pull_pkg].markedInstall and \
-                               not self._cache[pull_pkg].markedUpgrade) or \
-                               self._cache[pull_pkg].markedDelete):
+                               not self._cache[pull_pkg].marked_marked_upgrade) or \
+                               self._cache[pull_pkg].marked_delete):
                                 self.missing.add(pull_pkg)
                             else:
                                 self.installed.add(pull_pkg)
                     else:
                         if pkg in self._cache and \
-                           (self._cache[pkg].isInstalled or \
+                           (self._cache[pkg].is_installed or \
                            self._cache[pkg].markedInstall or \
-                           self._cache[pkg].markedUpgrade) and \
+                           self._cache[pkg].marked_marked_upgrade) and \
                            pull_pkg in self._cache:
-                            if ((not self._cache[pull_pkg].isInstalled and \
+                            if ((not self._cache[pull_pkg].is_installed and \
                                not self._cache[pull_pkg].markedInstall and \
-                               not self._cache[pull_pkg].markedUpgrade) or \
-                               self._cache[pull_pkg].markedDelete):
+                               not self._cache[pull_pkg].marked_marked_upgrade) or \
+                               self._cache[pull_pkg].marked_delete):
                                 self.missing.add(pull_pkg)
                             else:
                                 self.installed.add(pull_pkg)
@@ -295,7 +295,7 @@
                    not item.startswith('language-pack-gnome') and \
                    not item.startswith('language-pack-kde') and \
                    not item.endswith('-base') and \
-                   (self._cache[item].isInstalled or \
+                   (self._cache[item].is_installed or \
                    self._cache[item].markedInstall):
                     pkgcode = item.replace('language-pack-', '')
                     pkgcodes.append(pkgcode)

=== modified file 'LanguageSelector/LangCache.py'
--- LanguageSelector/LangCache.py	2010-05-28 10:42:08 +0000
+++ LanguageSelector/LangCache.py	2010-06-27 09:34:31 +0000
@@ -39,7 +39,7 @@
             pkgname = langpkg_status.pkgname_template % languageCode
             langpkg_status.available = pkgname in cache
             if langpkg_status.available:
-                langpkg_status.installed = cache[pkgname].isInstalled
+                langpkg_status.installed = cache[pkgname].is_installed
         
     @property
     def inconsistent(self):
@@ -81,7 +81,7 @@
 
     def __init__(self, localeinfo, progress):
         apt.Cache.__init__(self, progress)
-        if self._depcache.BrokenCount > 0:
+        if self._depcache.broken_count > 0:
             raise ExceptionPkgCacheBroken()
         self._localeinfo = localeinfo
         # keep the lists 
@@ -190,15 +190,15 @@
     @property
     def havePackageLists(self):
         " verify that a network package lists exists "
-        for metaindex in self._list.List:
-            for indexfile in metaindex.IndexFiles:
-                if indexfile.ArchiveURI("").startswith("cdrom:"):
-                    continue
-                if indexfile.ArchiveURI("").startswith("http://security.ubuntu.com"):
-                    continue
-                if indexfile.Label != "Debian Package Index":
-                    continue
-                if indexfile.Exists and indexfile.HasPackages:
+        for metaindex in self._list.list:
+            for indexfile in metaindex.index_files:
+                if indexfile.archive_uri("").startswith("cdrom:"):
+                    continue
+                if indexfile.archive_uri("").startswith("http://security.ubuntu.com"):
+                    continue
+                if indexfile.label != "Debian Package Index":
+                    continue
+                if indexfile.exists and indexfile.has_packageiss:
                     return True
         return False
 
@@ -218,9 +218,9 @@
         to_inst = []
         to_rm = []
         for pkg in self.getChanges():
-            if pkg.markedInstall or pkg.markedUpgrade:
+            if pkg.markedInstall or pkg.marked_marked_upgrade:
                 to_inst.append(pkg.name)
-            if pkg.markedDelete:
+            if pkg.marked_delete:
                 to_rm.append(pkg.name)
         return (to_inst,to_rm)
 
@@ -233,7 +233,7 @@
                     "language-pack-%s"%languageCode]
         # see what additional pkgs are needed
         #for (pkg, translation) in self.pkg_translations[languageCode]:
-        #    if pkg in self and self[pkg].isInstalled:
+        #    if pkg in self and self[pkg].is_installed:
         #        pkg_list.append(translation)
         return pkg_list
         
@@ -266,22 +266,22 @@
         if lang_pack_status.available and not lang_pack_status.installed:
                 for (pkg, translation) in self.pkg_translations[lang_pack_status.languageCode]:
                     if pkg in self and \
-                       (self[pkg].isInstalled or \
+                       (self[pkg].is_installed or \
                        self[pkg].markedInstall or \
-                       self[pkg].markedUpgrade) and \
+                       self[pkg].marked_marked_upgrade) and \
                        translation in self and \
-                       ((not self[translation].isInstalled and \
+                       ((not self[translation].is_installed and \
                        not self[translation].markedInstall and \
-                       not self[translation].markedUpgrade) or \
-                       self[translation].markedDelete):
+                       not self[translation].marked_marked_upgrade) or \
+                       self[translation].marked_delete):
                         self[translation].markInstall()
                         #print ("Will pull: %s" % translation)
         elif lang_pack_status.installed:
                 for (pkg, translation) in self.pkg_translations[lang_pack_status.languageCode]:
                     if translation in self and \
-                       (self[translation].isInstalled or \
+                       (self[translation].is_installed or \
                        self[translation].markedInstall or \
-                       self[translation].markedUpgrade):
+                       self[translation].marked_marked_upgrade):
                            self[translation].markDelete()
                            #print ("Will remove: %s" % translation)
 
@@ -296,24 +296,24 @@
                         # multiple dependencies, if one of them is installed, pull the pull_pkg
                         for p in pkg.split('|'):
                             if p in self and \
-                               (self[p].isInstalled or \
+                               (self[p].is_installed or \
                                self[p].markedInstall or \
-                               self[p].markedUpgrade) and \
-                               ((not self[pull_pkg].isInstalled and \
+                               self[p].marked_marked_upgrade) and \
+                               ((not self[pull_pkg].is_installed and \
                                not self[pull_pkg].markedInstall and \
-                               not self[pull_pkg].markedUpgrade) or \
-                               self[pull_pkg].markedDelete):
+                               not self[pull_pkg].marked_marked_upgrade) or \
+                               self[pull_pkg].marked_delete):
                                 self[pull_pkg].markInstall()
                                 #print ("Will pull: %s" % pull_pkg)
                     else:
                         if pkg in self and \
-                           (self[pkg].isInstalled or \
+                           (self[pkg].is_installed or \
                            self[pkg].markedInstall or \
-                           self[pkg].markedUpgrade) and \
-                           ((not self[pull_pkg].isInstalled and \
+                           self[pkg].marked_marked_upgrade) and \
+                           ((not self[pull_pkg].is_installed and \
                            not self[pull_pkg].markedInstall and \
-                           not self[pull_pkg].markedUpgrade) or \
-                           self[pull_pkg].markedDelete):
+                           not self[pull_pkg].marked_marked_upgrade) or \
+                           self[pull_pkg].marked_delete):
                             self[pull_pkg].markInstall()
                             #print ("Will pull: %s" % pull_pkg)
         elif writing_aid_status.installed and writing_aid_status.doChange:
@@ -328,25 +328,25 @@
                         for l in self.multilang[pull_pkg]:
                             p = "language-support-writing-%s" % l
                             if p in self and \
-                               (self[p].isInstalled or \
+                               (self[p].is_installed or \
                                self[p].markedInstall or \
-                               self[p].markedUpgrade) and \
-                               not self[p].markedDelete:
+                               self[p].marked_marked_upgrade) and \
+                               not self[p].marked_delete:
                                 lcount = lcount+1
                     if '|' in pkg:
                         # multiple dependencies, if at least one of them is installed, keep the pull_pkg
                         # only remove pull_pkg if none of the dependencies are installed anymore
                         for p in pkg.split('|'):
                             if p in self and \
-                               (self[p].isInstalled or \
+                               (self[p].is_installed or \
                                self[p].markedInstall or \
-                               self[p].markedUpgrade) and \
-                               not self[p].markedDelete:
+                               self[p].marked_marked_upgrade) and \
+                               not self[p].marked_delete:
                                 pcount = pcount+1
                     if pcount == 0  and lcount == 0 and \
-                        (self[pull_pkg].isInstalled or \
+                        (self[pull_pkg].is_installed or \
                         self[pull_pkg].markedInstall or \
-                        self[pull_pkg].markedUpgrade):
+                        self[pull_pkg].marked_marked_upgrade):
                         self[pull_pkg].markDelete()
                         #print ("Will remove: %s" % pull_pkg)
 

=== modified file 'LanguageSelector/LanguageSelector.py'
--- LanguageSelector/LanguageSelector.py	2010-05-27 08:12:43 +0000
+++ LanguageSelector/LanguageSelector.py	2010-06-27 09:34:31 +0000
@@ -52,32 +52,32 @@
             trans_package = "language-pack-%s" % langInfo.languageCode
             # we have a langpack installed, see if we have all of them
             if (trans_package in self._cache and \
-               (self._cache[trans_package].isInstalled or \
+               (self._cache[trans_package].is_installed or \
                self._cache[trans_package].markedInstall or \
-               self._cache[trans_package].markedUpgrade) and \
-               not self._cache[trans_package].markedDelete):
+               self._cache[trans_package].marked_marked_upgrade) and \
+               not self._cache[trans_package].marked_delete):
                 #print "IsInstalled: %s " % trans_package
                 #print self._cache.pkg_translations[langInfo.languageCode]
                 if langInfo.languageCode in self._cache.pkg_translations:
                     for (pkg, translation) in self._cache.pkg_translations[langInfo.languageCode]:
                         if (pkg in self._cache and \
-                           (self._cache[pkg].isInstalled or \
+                           (self._cache[pkg].is_installed or \
                            self._cache[pkg].markedInstall or \
-                           self._cache[pkg].markedUpgrade) and \
-                           not self._cache[pkg].markedDelete and \
+                           self._cache[pkg].marked_marked_upgrade) and \
+                           not self._cache[pkg].marked_delete and \
                            translation in self._cache and \
-                           ((not self._cache[translation].isInstalled and \
+                           ((not self._cache[translation].is_installed and \
                            not self._cache[translation].markedInstall and \
-                           not self._cache[translation].markedUpgrade) or \
-                           self._cache[translation].markedDelete) and \
+                           not self._cache[translation].marked_marked_upgrade) or \
+                           self._cache[translation].marked_delete) and \
                            not translation in missing):
                             missing.append(translation)
             trans_package = "language-support-writing-%s" % langInfo.languageCode
             # we have a langsupport-writing installed, see if we have all of them
             if (trans_package in self._cache and 
-               (self._cache[trans_package].isInstalled or \
+               (self._cache[trans_package].is_installed or \
                self._cache[trans_package].markedInstall or \
-               self._cache[trans_package].markedUpgrade)):
+               self._cache[trans_package].marked_marked_upgrade)):
                 #print "IsInstalled: %s " % trans_package
                 #print self._cache.pkg_writing[langInfo.languageCode]
                 if langInfo.languageCode in self._cache.pkg_writing:
@@ -86,28 +86,28 @@
                             # multiple dependencies, if one of them is installed, pull the pull_pkg
                             for p in pkg.split('|'):
                                 if self._cache[p] and \
-                                   (self._cache[p].isInstalled or \
+                                   (self._cache[p].is_installed or \
                                    self._cache[p].markedInstall or \
-                                   self._cache[p].markedUpgrade) and \
-                                   not self._cache[p].markedDelete and \
+                                   self._cache[p].marked_marked_upgrade) and \
+                                   not self._cache[p].marked_delete and \
                                    pull_pkg in self._cache and \
-                                   ((not self._cache[pull_pkg].isInstalled and \
+                                   ((not self._cache[pull_pkg].is_installed and \
                                    not self._cache[pull_pkg].markedInstall and \
-                                   not self._cache[pull_pkg].markedUpgrade) or \
-                                   self._cache[pull_pkg].markedDelete) and \
+                                   not self._cache[pull_pkg].marked_marked_upgrade) or \
+                                   self._cache[pull_pkg].marked_delete) and \
                                    not pull_pkg in missing:
                                     missing.append(pull_pkg)
                         else:
                             if pkg in self._cache and \
-                               (self._cache[pkg].isInstalled or \
+                               (self._cache[pkg].is_installed or \
                                self._cache[pkg].markedInstall or \
-                               self._cache[pkg].markedUpgrade) and \
-                               not self._cache[pkg].markedDelete and \
+                               self._cache[pkg].marked_marked_upgrade) and \
+                               not self._cache[pkg].marked_delete and \
                                pull_pkg in self._cache and \
-                               ((not self._cache[pull_pkg].isInstalled and \
+                               ((not self._cache[pull_pkg].is_installed and \
                                not self._cache[pull_pkg].markedInstall and \
-                               not self._cache[pull_pkg].markedUpgrade) or \
-                               self._cache[pull_pkg].markedDelete) and \
+                               not self._cache[pull_pkg].marked_marked_upgrade) or \
+                               self._cache[pull_pkg].marked_delete) and \
                                not pull_pkg in missing:
                                 missing.append(pull_pkg)
 
@@ -125,16 +125,16 @@
 #            pkgcode = self._cache.langpack_locales[default_lang]
         trans_package = "language-pack-%s" % pkgcode
         if (trans_package in self._cache and 
-            not self._cache[trans_package].isInstalled):
+            not self._cache[trans_package].is_installed):
             missing += [trans_package]
             if pkgcode in self._cache.pkg_translations:
                 for (pkg, translation) in self._cache.pkg_translations[pkgcode]:
-                    if (self._cache[pkg].isInstalled and not self._cache[translation].isInstalled):
+                    if (self._cache[pkg].is_installed and not self._cache[translation].is_installed):
                         missing.append(translation)
         support_packages = LanguageSelectorPkgCache._getPkgList(self._cache, pkgcode)
         for support_package in support_packages:
             if (support_package in self._cache and 
-                not self._cache[support_package].isInstalled):
+                not self._cache[support_package].is_installed):
                 missing.append(support_package)
 
         if pkgcode in self._cache.pkg_writing:
@@ -143,28 +143,28 @@
                     # multiple dependencies, if one of them is installed, pull the pull_pkg
                     for p in pkg.split('|'):
                         if self._cache[p] and \
-                           (self._cache[p].isInstalled or \
+                           (self._cache[p].is_installed or \
                            self._cache[p].markedInstall or \
-                           self._cache[p].markedUpgrade) and \
-                           not self._cache[p].markedDelete and \
+                           self._cache[p].marked_marked_upgrade) and \
+                           not self._cache[p].marked_delete and \
                            pull_pkg in self._cache and \
-                           ((not self._cache[pull_pkg].isInstalled and \
+                           ((not self._cache[pull_pkg].is_installed and \
                            not self._cache[pull_pkg].markedInstall and \
-                           not self._cache[pull_pkg].markedUpgrade) or \
-                           self._cache[pull_pkg].markedDelete) and \
+                           not self._cache[pull_pkg].marked_marked_upgrade) or \
+                           self._cache[pull_pkg].marked_delete) and \
                            not pull_pkg in missing:
                             missing.append(pull_pkg)
                 else:
                     if pkg in self._cache and \
-                       (self._cache[pkg].isInstalled or \
+                       (self._cache[pkg].is_installed or \
                        self._cache[pkg].markedInstall or \
-                       self._cache[pkg].markedUpgrade) and \
-                       not self._cache[pkg].markedDelete and \
+                       self._cache[pkg].marked_marked_upgrade) and \
+                       not self._cache[pkg].marked_delete and \
                        pull_pkg in self._cache and \
-                       ((not self._cache[pull_pkg].isInstalled and \
+                       ((not self._cache[pull_pkg].is_installed and \
                        not self._cache[pull_pkg].markedInstall and \
-                       not self._cache[pull_pkg].markedUpgrade) or \
-                       self._cache[pull_pkg].markedDelete) and \
+                       not self._cache[pull_pkg].marked_marked_upgrade) or \
+                       self._cache[pull_pkg].marked_delete) and \
                        not pull_pkg in missing:
                         missing.append(pull_pkg)