Fix some warnings found by pylint.

diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLock.py
index 9d0545beba04d82433c9d6ab2f0bc2493ac3364d..ae3bde4d6a77d7465668c9e2ae467e5a5869cbbe 100644 (file)
--- a/pym/_emerge/AsynchronousLock.py
+++ b/pym/_emerge/AsynchronousLock.py
@@ -10,7 +10,7 @@ import sys
 try:
        import threading
 except ImportError:
-       import dummy_threading as threading
+       threading = dummy_threading
 
 import portage
 from portage import os
@@ -117,7 +117,7 @@ class _LockThread(AbstractPollTask):
                self._files = {}
                self._files['pipe_read'] = pr
                self._files['pipe_write'] = pw
-               for k, f in self._files.items():
+               for f in self._files.values():
                        fcntl.fcntl(f, fcntl.F_SETFL,
                                fcntl.fcntl(f, fcntl.F_GETFL) | os.O_NONBLOCK)
                self._reg_id = self.scheduler.register(self._files['pipe_read'],

diff --git a/pym/_emerge/BinpkgExtractorAsync.py b/pym/_emerge/BinpkgExtractorAsync.py
index d1630f242ac797e87568e89f3d956b670d8275d0..f25cbf93386ae7827774d820e863eb910157f1b0 100644 (file)
--- a/pym/_emerge/BinpkgExtractorAsync.py
+++ b/pym/_emerge/BinpkgExtractorAsync.py
@@ -1,9 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from _emerge.SpawnProcess import SpawnProcess
 import portage
-import os
 import signal
 
 class BinpkgExtractorAsync(SpawnProcess):

diff --git a/pym/_emerge/BlockerCache.py b/pym/_emerge/BlockerCache.py
index 0076828233585f315968bf0ece82c217ee9749d2..57e9d2cc5b6787863bba9d42ae00a56d27d0ddb7 100644 (file)
--- a/pym/_emerge/BlockerCache.py
+++ b/pym/_emerge/BlockerCache.py
@@ -145,7 +145,7 @@ class BlockerCache(portage.cache.mappings.MutableMapping):
                                f.close()
                                portage.util.apply_secpass_permissions(
                                        self._cache_filename, gid=portage.portage_gid, mode=0o644)
-                       except (IOError, OSError) as e:
+                       except (IOError, OSError):
                                pass
                        self._modified.clear()
 

diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.py
index f8febd47cc52116c5f760429066c936f7ae4695d..2b8f1206e768aa8cccea505a3a3d8c16f1699f7b 100644 (file)
--- a/pym/_emerge/EbuildExecuter.py
+++ b/pym/_emerge/EbuildExecuter.py
@@ -34,8 +34,6 @@ class EbuildExecuter(CompositeTask):
                cleanup = 0
                portage.prepare_build_dirs(pkg.root, settings, cleanup)
 
-               portdb = pkg.root_config.trees['porttree'].dbapi
-               ebuild_path = settings['EBUILD']
                alist = settings.configdict["pkg"].get("A", "").split()
                _prepare_fake_distdir(settings, alist)
 

diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py
index 626d4719c22caad6219dce63a2d3779ee695f798..e1e575706b703b3ac107a5f3fa2b5f9f83597a5c 100644 (file)
--- a/pym/_emerge/FakeVartree.py
+++ b/pym/_emerge/FakeVartree.py
@@ -167,8 +167,6 @@ class FakeVartree(vartree):
                real_vardb = self._root_config.trees["vartree"].dbapi
                current_cpv_set = frozenset(real_vardb.cpv_all())
                pkg_vardb = self.dbapi
-               pkg_cache = self._pkg_cache
-               aux_get_history = self._aux_get_history
 
                # Remove any packages that have been uninstalled.
                for pkg in list(pkg_vardb):

diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py
index b162fe5ccc2746326566c7424ddb643b88b585e0..0f784cf8bc75157ea71efd4f9a255fa2a2e95bf4 100644 (file)
--- a/pym/_emerge/PipeReader.py
+++ b/pym/_emerge/PipeReader.py
@@ -26,7 +26,7 @@ class PipeReader(AbstractPollTask):
                else:
                        output_handler = self._output_handler
 
-               for k, f in self.input_files.items():
+               for f in self.input_files.values():
                        fcntl.fcntl(f.fileno(), fcntl.F_SETFL,
                                fcntl.fcntl(f.fileno(), fcntl.F_GETFL) | os.O_NONBLOCK)
                        self._reg_ids.add(self.scheduler.register(f.fileno(),

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index b3d0b12685dc49aff49c730d75c3fa2113c11531..1725053a163f4dbebd1efc06b35580ff1dcebdaa 100644 (file)
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -187,8 +187,7 @@ def action_build(settings, trees, mtimedb,
                        " entire repository or category at once."
                prefix = bad(" * ")
                writemsg(prefix + "\n")
-               from textwrap import wrap
-               for line in wrap(msg, 72):
+               for line in textwrap.wrap(msg, 72):
                        writemsg("%s%s\n" % (prefix, line))
                writemsg(prefix + "\n")
 
@@ -216,7 +215,6 @@ def action_build(settings, trees, mtimedb,
                        if isinstance(e, depgraph.UnsatisfiedResumeDep):
                                mydepgraph = e.depgraph
 
-                       from textwrap import wrap
                        from portage.output import EOutput
                        out = EOutput()
 
@@ -255,7 +253,7 @@ def action_build(settings, trees, mtimedb,
                                        "to skip the first package in the list and " + \
                                        "any other packages that may be " + \
                                        "masked or have missing dependencies."
-                               for line in wrap(msg, 72):
+                               for line in textwrap.wrap(msg, 72):
                                        out.eerror(line)
                        elif isinstance(e, portage.exception.PackageNotFound):
                                out.eerror("An expected package is " + \
@@ -265,7 +263,7 @@ def action_build(settings, trees, mtimedb,
                                        "packages that are no longer " + \
                                        "available. Please restart/continue " + \
                                        "the operation manually."
-                               for line in wrap(msg, 72):
+                               for line in textwrap.wrap(msg, 72):
                                        out.eerror(line)
 
                if success:
@@ -1066,9 +1064,8 @@ def calc_depclean(settings, trees, ldpath_mtimes,
                                "the packages that pulled them in."
 
                        prefix = bad(" * ")
-                       from textwrap import wrap
                        writemsg_level("".join(prefix + "%s\n" % line for \
-                               line in wrap(msg, 70)), level=logging.WARNING, noiselevel=-1)
+                               line in textwrap.wrap(msg, 70)), level=logging.WARNING, noiselevel=-1)
 
                        msg = []
                        for pkg in sorted(consumer_map, key=cmp_sort_key(cmp_pkg_cpv)):
@@ -2755,8 +2752,8 @@ def adjust_config(myopts, settings):
        if settings.get("NOCOLOR") not in ("yes","true"):
                portage.output.havecolor = 1
 
-       """The explicit --color < y | n > option overrides the NOCOLOR environment
-       variable and stdout auto-detection."""
+       # The explicit --color < y | n > option overrides the NOCOLOR environment
+       # variable and stdout auto-detection.
        if "--color" in myopts:
                if "y" == myopts["--color"]:
                        portage.output.havecolor = 1
@@ -2828,7 +2825,7 @@ def getportageversion(portdir, _unused, profile, chost, vardb):
                for cpv in sorted(libclist):
                        libc_split = portage.catpkgsplit(cpv)[1:]
                        if libc_split[-1] == "r0":
-                               libc_split[:-1]
+                               libc_split = libc_split[:-1]
                        libcver.append("-".join(libc_split))
        else:
                libcver = ["unavailable"]
@@ -2987,7 +2984,7 @@ def load_emerge_config(trees=None):
                        kwargs[k] = v
        trees = portage.create_trees(trees=trees, **kwargs)
 
-       for root, root_trees in trees.items():
+       for root_trees in trees.values():
                settings = root_trees["vartree"].settings
                settings._init_dirs()
                setconfig = load_default_config(settings, root_trees)

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 63365cd9640cd9d1faa170eea6152b0c4ed42f27..93819c611ba64a87af380d56456dd156f4fda926 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -928,7 +928,6 @@ class depgraph(object):
                buildpkgonly = "--buildpkgonly" in self._frozen_config.myopts
                nodeps = "--nodeps" in self._frozen_config.myopts
                deep = self._dynamic_config.myparams.get("deep", 0)
-               recurse = deep is True or dep.depth <= deep
                if dep.blocker:
                        if not buildpkgonly and \
                                not nodeps and \
@@ -973,7 +972,7 @@ class depgraph(object):
                        # infinite backtracking loop.
                        if self._dynamic_config._allow_backtracking:
                                if dep.parent in self._dynamic_config._runtime_pkg_mask:
-                                       if "--debug" in self._frozen_config.myopts:
+                                       if debug:
                                                writemsg(
                                                        "!!! backtracking loop detected: %s %s\n" % \
                                                        (dep.parent,
@@ -988,7 +987,7 @@ class depgraph(object):
                                        if dep_pkg is None:
                                                self._dynamic_config._backtrack_infos["missing dependency"] = dep
                                                self._dynamic_config._need_restart = True
-                                               if "--debug" in self._frozen_config.myopts:
+                                               if debug:
                                                        msg = []
                                                        msg.append("")
                                                        msg.append("")
@@ -1069,8 +1068,6 @@ class depgraph(object):
                # are never processed more than once.
                previously_added = pkg in self._dynamic_config.digraph
 
-               # select the correct /var database that we'll be checking against
-               vardbapi = self._frozen_config.trees[pkg.root]["vartree"].dbapi
                pkgsettings = self._frozen_config.pkgsettings[pkg.root]
 
                arg_atoms = None
@@ -1311,12 +1308,11 @@ class depgraph(object):
                                self._dynamic_config.digraph.add(pkg, parent, priority=priority)
                                self._add_parent_atom(pkg, parent_atom)
 
-               """ This section determines whether we go deeper into dependencies or not.
-                       We want to go deeper on a few occasions:
-                       Installing package A, we need to make sure package A's deps are met.
-                       emerge --deep <pkgspec>; we need to recursively check dependencies of pkgspec
-                       If we are in --nodeps (no recursion) mode, we obviously only check 1 level of dependencies.
-               """
+               # This section determines whether we go deeper into dependencies or not.
+               # We want to go deeper on a few occasions:
+               # Installing package A, we need to make sure package A's deps are met.
+               # emerge --deep <pkgspec>; we need to recursively check dependencies of pkgspec
+               # If we are in --nodeps (no recursion) mode, we obviously only check 1 level of dependencies.
                if arg_atoms:
                        depth = 0
                pkg.depth = depth
@@ -1366,11 +1362,7 @@ class depgraph(object):
 
                mytype = pkg.type_name
                myroot = pkg.root
-               mykey = pkg.cpv
                metadata = pkg.metadata
-               myuse = self._pkg_use_enabled(pkg)
-               jbigkey = pkg
-               depth = pkg.depth + 1
                removal_action = "remove" in self._dynamic_config.myparams
 
                edepend={}
@@ -1434,7 +1426,6 @@ class depgraph(object):
                )
 
                debug = "--debug" in self._frozen_config.myopts
-               strict = mytype != "installed"
 
                for dep_root, dep_string, dep_priority in deps:
                                if not dep_string:
@@ -1527,7 +1518,7 @@ class depgraph(object):
                        selected_atoms = self._select_atoms(dep_root,
                                dep_string, myuse=self._pkg_use_enabled(pkg), parent=pkg,
                                strict=strict, priority=dep_priority)
-               except portage.exception.InvalidDependString as e:
+               except portage.exception.InvalidDependString:
                        if pkg.installed:
                                self._dynamic_config._masked_installed.add(pkg)
                                return 1
@@ -1777,7 +1768,7 @@ class depgraph(object):
                        pkg_atom_map.setdefault(pkg, set()).add(atom)
                        cp_pkg_map.setdefault(pkg.cp, set()).add(pkg)
 
-               for cp, pkgs in cp_pkg_map.items():
+               for pkgs in cp_pkg_map.values():
                        if len(pkgs) < 2:
                                for pkg in pkgs:
                                        for atom in pkg_atom_map[pkg]:
@@ -1932,7 +1923,6 @@ class depgraph(object):
        def _iter_atoms_for_pkg(self, pkg):
                depgraph_sets = self._dynamic_config.sets[pkg.root]
                atom_arg_map = depgraph_sets.atom_arg_map
-               root_config = self._frozen_config.roots[pkg.root]
                for atom in depgraph_sets.atoms.iterAtomsForPackage(pkg):
                        if atom.cp != pkg.cp and \
                                self._have_new_virt(pkg.root, atom.cp):
@@ -1971,7 +1961,6 @@ class depgraph(object):
                myfavorites=[]
                eroot = root_config.root
                root = root_config.settings['ROOT']
-               dbs = self._dynamic_config._filtered_trees[eroot]["dbs"]
                vardb = self._frozen_config.trees[eroot]["vartree"].dbapi
                real_vardb = self._frozen_config._trees_orig[eroot]["vartree"].dbapi
                portdb = self._frozen_config.trees[eroot]["porttree"].dbapi
@@ -2948,7 +2937,6 @@ class depgraph(object):
                missing_use_adjustable = set()
                required_use_unsatisfied = []
                masked_pkg_instances = set()
-               missing_licenses = []
                have_eapi_mask = False
                pkgsettings = self._frozen_config.pkgsettings[root]
                root_config = self._frozen_config.roots[root]
@@ -2959,7 +2947,6 @@ class depgraph(object):
                for db, pkg_type, built, installed, db_keys in dbs:
                        if installed:
                                continue
-                       match = db.match
                        if hasattr(db, "xmatch"):
                                cpv_list = db.xmatch("match-all-cpv-only", atom.without_use)
                        else:
@@ -3478,7 +3465,6 @@ class depgraph(object):
                self._dynamic_config._highest_pkg_cache[cache_key] = ret
                pkg, existing = ret
                if pkg is not None:
-                       settings = pkg.root_config.settings
                        if self._pkg_visibility_check(pkg) and \
                                not (pkg.installed and pkg.masks):
                                self._dynamic_config._visible_pkgs[pkg.root].cpv_inject(pkg)
@@ -3740,7 +3726,6 @@ class depgraph(object):
                pkgsettings = self._frozen_config.pkgsettings[root]
                dbs = self._dynamic_config._filtered_trees[root]["dbs"]
                vardb = self._frozen_config.roots[root].trees["vartree"].dbapi
-               portdb = self._frozen_config.roots[root].trees["porttree"].dbapi
                # List of acceptable packages, ordered by type preference.
                matched_packages = []
                matched_pkgs_ignore_use = []
@@ -4433,9 +4418,6 @@ class depgraph(object):
                        "--nodeps" in self._frozen_config.myopts:
                        return True
 
-               complete = "complete" in self._dynamic_config.myparams
-               deep = "deep" in self._dynamic_config.myparams
-
                if True:
                        # Pull in blockers from all installed packages that haven't already
                        # been pulled into the depgraph, in order to ensure that they are
@@ -4450,10 +4432,8 @@ class depgraph(object):
                        dep_keys = ["RDEPEND", "PDEPEND"]
                        for myroot in self._frozen_config.trees:
                                vardb = self._frozen_config.trees[myroot]["vartree"].dbapi
-                               portdb = self._frozen_config.trees[myroot]["porttree"].dbapi
                                pkgsettings = self._frozen_config.pkgsettings[myroot]
                                root_config = self._frozen_config.roots[myroot]
-                               dbs = self._dynamic_config._filtered_trees[myroot]["dbs"]
                                final_db = self._dynamic_config.mydbapi[myroot]
 
                                blocker_cache = BlockerCache(myroot, vardb)
@@ -6355,7 +6335,6 @@ class depgraph(object):
 
                args_set = self._dynamic_config.sets[
                        self._frozen_config.target_root].sets['__non_set_args__']
-               portdb = self._frozen_config.trees[self._frozen_config.target_root]["porttree"].dbapi
                added_favorites = set()
                for x in self._dynamic_config._set_nodes:
                        if x.operation != "nomerge":
@@ -6419,15 +6398,12 @@ class depgraph(object):
                        mergelist = []
 
                favorites = resume_data.get("favorites")
-               args_set = self._dynamic_config.sets[
-                       self._frozen_config.target_root].sets['__non_set_args__']
                if isinstance(favorites, list):
                        args = self._load_favorites(favorites)
                else:
                        args = []
 
                fakedb = self._dynamic_config.mydbapi
-               trees = self._frozen_config.trees
                serialized_tasks = []
                masked_tasks = []
                for x in mergelist:
@@ -7085,7 +7061,6 @@ def _resume_depgraph(settings, trees, mtimedb, myopts, myparams, spinner):
 
 def get_mask_info(root_config, cpv, pkgsettings,
        db, pkg_type, built, installed, db_keys, myrepo = None, _pkg_use_enabled=None):
-       eapi_masked = False
        try:
                metadata = dict(zip(db_keys,
                        db.aux_get(cpv, db_keys, myrepo=myrepo)))
@@ -7195,7 +7170,7 @@ def _get_masking_status(pkg, pkgsettings, root_config, myrepo=None, use=None):
                                pkg.metadata["CHOST"]))
 
        if pkg.invalid:
-               for msg_type, msgs in pkg.invalid.items():
+               for msgs in pkg.invalid.values():
                        for msg in msgs:
                                mreasons.append(
                                        _MaskReason("invalid", "invalid: %s" % (msg,)))

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index ce73c176473072408b9bee95ddfb714c63624ec9..0a9bd1d70bd5445bec0a9dd85d2697a9649ac339 100644 (file)
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -10,7 +10,6 @@ import sys
 import textwrap
 import platform
 import portage
-import portage
 portage.proxy.lazyimport.lazyimport(globals(),
        'portage.news:count_unread_news,display_news_notifications',
 )
@@ -253,7 +252,6 @@ def display_preserved_libs(vardbapi, myopts):
                linkmap = vardbapi._linkmap
                consumer_map = {}
                owners = {}
-               linkmap_broken = False
 
                try:
                        linkmap.rebuild()
@@ -261,7 +259,6 @@ def display_preserved_libs(vardbapi, myopts):
                        writemsg_level("!!! Command Not Found: %s\n" % (e,),
                                level=logging.ERROR, noiselevel=-1)
                        del e
-                       linkmap_broken = True
                else:
                        search_for_owners = set()
                        for cpv in plibdata:
@@ -603,8 +600,6 @@ def parse_opts(tmpcmdline, silent=False):
        myopts = {}
        myfiles=[]
 
-       global options, shortmapping
-
        actions = frozenset([
                "clean", "check-news", "config", "depclean", "help",
                "info", "list-sets", "metadata", "moo",
@@ -1562,7 +1557,7 @@ def config_protect_check(trees):
 def profile_check(trees, myaction):
        if myaction in ("help", "info", "search", "sync", "version"):
                return os.EX_OK
-       for root, root_trees in trees.items():
+       for root_trees in trees.values():
                if root_trees["root_config"].settings.profiles:
                        continue
                # generate some profile related warning messages

diff --git a/pym/_emerge/resolver/backtracking.py b/pym/_emerge/resolver/backtracking.py
index e072275fedce5e596bae284999f39640cf8d4368..f2857b0f5762db2bbf0859e9a79744312dcc9b96 100644 (file)
--- a/pym/_emerge/resolver/backtracking.py
+++ b/pym/_emerge/resolver/backtracking.py
@@ -47,7 +47,7 @@ class BacktrackParameter(object):
                        self.reinstall_list == other.reinstall_list
 
 
-class _BacktrackNode:
+class _BacktrackNode(object):
 
        __slots__ = (
                "parameter", "depth", "mask_steps", "terminal",