Remove unused imports found by pylint.

35 files changed, 34 insertions, 84 deletions

diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractEbuildProcess.py
index ecd44f5af..bbbb28136 100644
--- a/pym/_emerge/AbstractEbuildProcess.py
+++ b/pym/_emerge/AbstractEbuildProcess.py
@@ -1,7 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-import codecs
 import stat
 import textwrap
 from _emerge.SpawnProcess import SpawnProcess
@@ -15,9 +14,8 @@ from portage import os
 from portage import StringIO
 from portage import _encodings
 from portage import _unicode_decode
-from portage import _unicode_encode
 from portage.util._pty import _create_pty_or_pipe
-from portage.util import apply_secpass_permissions, writemsg_stdout
+from portage.util import apply_secpass_permissions
 
 class AbstractEbuildProcess(SpawnProcess):
 
diff --git a/pym/_emerge/AtomArg.py b/pym/_emerge/AtomArg.py
index 244ea28e7..871e2b71d 100644
--- a/pym/_emerge/AtomArg.py
+++ b/pym/_emerge/AtomArg.py
@@ -1,14 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from _emerge.DependencyArg import DependencyArg
-try:
-	import portage
-except ImportError:
-	from os import path as osp
-	import sys
-	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
-	import portage
+
 class AtomArg(DependencyArg):
 	def __init__(self, atom=None, **kwargs):
 		DependencyArg.__init__(self, **kwargs)
diff --git a/pym/_emerge/BinpkgVerifier.py b/pym/_emerge/BinpkgVerifier.py
index 198091da4..ab3191361 100644
--- a/pym/_emerge/BinpkgVerifier.py
+++ b/pym/_emerge/BinpkgVerifier.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from _emerge.AsynchronousTask import AsynchronousTask
@@ -8,10 +8,7 @@ import portage
 from portage import os
 from portage import _encodings
 from portage import _unicode_decode
-from portage import _unicode_encode
-from portage import StringIO
 from portage.package.ebuild.fetch import _checksum_failure_temp_file
-import codecs
 
 class BinpkgVerifier(AsynchronousTask):
 	__slots__ = ("logfile", "pkg", "scheduler")
diff --git a/pym/_emerge/Blocker.py b/pym/_emerge/Blocker.py
index 04b6bb1d4..5c335b066 100644
--- a/pym/_emerge/Blocker.py
+++ b/pym/_emerge/Blocker.py
@@ -1,14 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from _emerge.Task import Task
-try:
-	import portage
-except ImportError:
-	from os import path as osp
-	import sys
-	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
-	import portage
+
 class Blocker(Task):
 
 	__hash__ = Task.__hash__
diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py
index 5c108fee4..f058cae12 100644
--- a/pym/_emerge/EbuildBuild.py
+++ b/pym/_emerge/EbuildBuild.py
@@ -13,9 +13,6 @@ from _emerge.MiscFunctionsProcess import MiscFunctionsProcess
 from portage.util import writemsg
 import portage
 from portage import os
-from portage import _encodings
-from portage import _unicode_encode
-import codecs
 from portage.output import colorize
 from portage.package.ebuild.digestcheck import digestcheck
 from portage.package.ebuild.doebuild import _check_temp_dir
diff --git a/pym/_emerge/EbuildFetcher.py b/pym/_emerge/EbuildFetcher.py
index 63e423771..bbae6a6a1 100644
--- a/pym/_emerge/EbuildFetcher.py
+++ b/pym/_emerge/EbuildFetcher.py
@@ -10,7 +10,6 @@ from portage import _unicode_encode
 from portage import _unicode_decode
 import codecs
 from portage.elog.messages import eerror
-from portage.util import writemsg_stdout
 from portage.util._pty import _create_pty_or_pipe
 
 class EbuildFetcher(SpawnProcess):
diff --git a/pym/_emerge/EbuildSpawnProcess.py b/pym/_emerge/EbuildSpawnProcess.py
index dd12b74e9..e1f682a66 100644
--- a/pym/_emerge/EbuildSpawnProcess.py
+++ b/pym/_emerge/EbuildSpawnProcess.py
@@ -2,8 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 from _emerge.AbstractEbuildProcess import AbstractEbuildProcess
-import portage
-from portage import os
 
 class EbuildSpawnProcess(AbstractEbuildProcess):
 	"""
diff --git a/pym/_emerge/PackageUninstall.py b/pym/_emerge/PackageUninstall.py
index e806bc154..5e8850b18 100644
--- a/pym/_emerge/PackageUninstall.py
+++ b/pym/_emerge/PackageUninstall.py
@@ -1,12 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-import codecs
 import logging
 import portage
 from portage import os
-from portage import _encodings
-from portage import _unicode_encode
 from _emerge.AsynchronousTask import AsynchronousTask
 from _emerge.unmerge import unmerge
 from _emerge.UninstallFailure import UninstallFailure
diff --git a/pym/_emerge/PollScheduler.py b/pym/_emerge/PollScheduler.py
index 2c9eb2a8c..f536de0fb 100644
--- a/pym/_emerge/PollScheduler.py
+++ b/pym/_emerge/PollScheduler.py
@@ -8,7 +8,6 @@ import time
 
 from portage import _encodings
 from portage import _unicode_encode
-from portage import os
 from portage.util import writemsg_level
 
 from _emerge.SlotObject import SlotObject
diff --git a/pym/_emerge/RootConfig.py b/pym/_emerge/RootConfig.py
index 2898c2e0d..110f11694 100644
--- a/pym/_emerge/RootConfig.py
+++ b/pym/_emerge/RootConfig.py
@@ -1,8 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-from _emerge.PackageVirtualDbapi import PackageVirtualDbapi
-
 class RootConfig(object):
 	"""This is used internally by depgraph to track information about a
 	particular $ROOT."""
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index 3bfc74124..7db16088d 100644
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -3,7 +3,6 @@
 
 from __future__ import print_function
 
-import codecs
 import gzip
 import logging
 import shutil
@@ -18,7 +17,6 @@ import portage
 from portage import StringIO
 from portage import os
 from portage import _encodings
-from portage import _unicode_decode
 from portage import _unicode_encode
 from portage.cache.mappings import slot_dict_class
 from portage.const import LIBC_PACKAGE_ATOM
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 1f00cb3a6..815032d14 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -25,7 +25,7 @@ from itertools import chain
 import portage
 from portage import os
 from portage import digraph
-from portage import _unicode_decode, _unicode_encode
+from portage import _unicode_decode
 from portage.cache.cache_errors import CacheError
 from portage.const import GLOBAL_CONFIG_PATH, NEWS_LIB_PATH
 from portage.dbapi.dep_expand import dep_expand
diff --git a/pym/_emerge/clear_caches.py b/pym/_emerge/clear_caches.py
index 30371f03f..5999f281a 100644
--- a/pym/_emerge/clear_caches.py
+++ b/pym/_emerge/clear_caches.py
@@ -1,8 +1,7 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 import gc
-import portage
 from portage.util.listdir import dircache
 
 def clear_caches(trees):
diff --git a/pym/_emerge/create_world_atom.py b/pym/_emerge/create_world_atom.py
index 146cc4ccb..54964186c 100644
--- a/pym/_emerge/create_world_atom.py
+++ b/pym/_emerge/create_world_atom.py
@@ -1,8 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-import portage
-
 def create_world_atom(pkg, args_set, root_config):
 	"""Create a new atom for the world file if one does not exist.  If the
 	argument atom is precise enough to identify a specific slot then a slot
diff --git a/pym/_emerge/resolver/circular_dependency.py b/pym/_emerge/resolver/circular_dependency.py
index 0ecdbbe8c..78c5bebc7 100644
--- a/pym/_emerge/resolver/circular_dependency.py
+++ b/pym/_emerge/resolver/circular_dependency.py
@@ -5,7 +5,6 @@ from __future__ import print_function
 
 from itertools import chain
 
-from portage.util import writemsg
 from portage.dep import use_reduce, extract_affecting_use, check_required_use, get_required_use_flags
 from portage.output import colorize
 from _emerge.DepPrioritySatisfiedRange import DepPrioritySatisfiedRange
diff --git a/pym/portage/_selinux.py b/pym/portage/_selinux.py
index e14324e55..cad5be8cc 100644
--- a/pym/portage/_selinux.py
+++ b/pym/portage/_selinux.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Don't use the unicode-wrapped os and shutil modules here since
@@ -13,7 +13,6 @@ from portage import _unicode_encode
 from portage.localization import _
 
 import selinux
-from selinux import is_selinux_enabled
 
 def copyfile(src, dest):
 	src = _unicode_encode(src, encoding=_encodings['fs'], errors='strict')
diff --git a/pym/portage/cache/metadata_overlay.py b/pym/portage/cache/metadata_overlay.py
index a4053372b..cfa0051e6 100644
--- a/pym/portage/cache/metadata_overlay.py
+++ b/pym/portage/cache/metadata_overlay.py
@@ -1,7 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-import time
 from portage.cache import template
 from portage.cache.cache_errors import CacheCorruption
 from portage.cache.flat_hash import database as db_rw
diff --git a/pym/portage/cache/sqlite.py b/pym/portage/cache/sqlite.py
index cd118f515..2e13be320 100644
--- a/pym/portage/cache/sqlite.py
+++ b/pym/portage/cache/sqlite.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 import sys
@@ -6,7 +6,6 @@ from portage.cache import fs_template
 from portage.cache import cache_errors
 from portage import os
 from portage import _unicode_decode
-from portage.cache.template import reconstruct_eclasses
 from portage.util import writemsg
 from portage.localization import _
 try:
diff --git a/pym/portage/checksum.py b/pym/portage/checksum.py
index e460e7ac7..f640fd9f1 100644
--- a/pym/portage/checksum.py
+++ b/pym/portage/checksum.py
@@ -1,9 +1,9 @@
 # checksum.py -- core Portage functionality
-# Copyright 1998-2004 Gentoo Foundation
+# Copyright 1998-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 import portage
-from portage.const import PRIVATE_PATH,PRELINK_BINARY,HASHING_BLOCKSIZE
+from portage.const import PRELINK_BINARY,HASHING_BLOCKSIZE
 from portage.localization import _
 from portage import os
 from portage import _encodings
diff --git a/pym/portage/data.py b/pym/portage/data.py
index fd464378d..c38fa17bc 100644
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -1,8 +1,8 @@
 # data.py -- Calculated/Discovered Data Values
-# Copyright 1998-2009 Gentoo Foundation
+# Copyright 1998-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-import os, sys, pwd, grp, platform
+import os, pwd, grp, platform
 
 import portage
 portage.proxy.lazyimport.lazyimport(globals(),
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 1780b4339..ed6b761b6 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -1,4 +1,4 @@
-# Copyright 1998-2009 Gentoo Foundation
+# Copyright 1998-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 __all__ = [
@@ -32,7 +32,6 @@ from portage import eclass_cache, auxdbkeys, \
 	_eapi_is_deprecated
 from portage import os
 from portage import _encodings
-from portage import _unicode_decode
 from portage import _unicode_encode
 from portage import OrderedDict
 from _emerge.EbuildMetadataPhase import EbuildMetadataPhase
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 34dc14718..592fce961 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -54,7 +54,7 @@ from _emerge.MiscFunctionsProcess import MiscFunctionsProcess
 
 import codecs
 import gc
-import re, shutil, stat, errno, copy, subprocess
+import re, shutil, stat, errno, subprocess
 import logging
 import os as _os
 import stat
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py
index 07a38d0c5..cdedf7920 100644
--- a/pym/portage/dep/dep_check.py
+++ b/pym/portage/dep/dep_check.py
@@ -7,8 +7,6 @@ import logging
 
 import portage
 from portage.dep import Atom, match_from_list, use_reduce
-from portage.eapi import eapi_has_strong_blocks, eapi_has_use_deps, eapi_has_slot_deps, \
-	eapi_has_use_dep_defaults
 from portage.exception import InvalidDependString, ParseError
 from portage.localization import _
 from portage.util import writemsg, writemsg_level
diff --git a/pym/portage/elog/filtering.py b/pym/portage/elog/filtering.py
index 2e154242b..82181a4cb 100644
--- a/pym/portage/elog/filtering.py
+++ b/pym/portage/elog/filtering.py
@@ -1,9 +1,7 @@
 # elog/messages.py - elog core functions
-# Copyright 2006-2007 Gentoo Foundation
+# Copyright 2006-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-from portage.const import EBUILD_PHASES
-
 def filter_loglevels(logentries, loglevels):
 	# remove unwanted entries from all logentries
 	rValue = {}
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 9fa6476e0..cc1f60d86 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -4,7 +4,6 @@
 __all__ = ['doebuild', 'doebuild_environment', 'spawn', 'spawnebuild']
 
 import codecs
-import errno
 import gzip
 from itertools import chain
 import logging
@@ -43,7 +42,7 @@ from portage.eapi import eapi_exports_KV, eapi_exports_replace_vars, \
 from portage.elog import elog_process
 from portage.elog.messages import eerror, eqawarn
 from portage.exception import DigestException, FileNotFound, \
-	IncorrectParameter, InvalidAtom, InvalidDependString, PermissionDenied, \
+	IncorrectParameter, InvalidDependString, PermissionDenied, \
 	UnsupportedAPIException
 from portage.localization import _
 from portage.manifest import Manifest
diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py
index 86d4db96d..06cb90801 100644
--- a/pym/portage/package/ebuild/fetch.py
+++ b/pym/portage/package/ebuild/fetch.py
@@ -28,7 +28,7 @@ from portage import OrderedDict, os, selinux, _encodings, \
 	_shell_quote, _unicode_encode
 from portage.checksum import perform_md5, verify_all
 from portage.const import BASH_BINARY, CUSTOM_MIRRORS_FILE, \
-	EBUILD_SH_BINARY, GLOBAL_CONFIG_PATH
+	GLOBAL_CONFIG_PATH
 from portage.data import portage_gid, portage_uid, secpass, userpriv_groups
 from portage.exception import FileNotFound, OperationNotPermitted, \
 	PermissionDenied, PortageException, TryAgain
diff --git a/pym/portage/process.py b/pym/portage/process.py
index 66ec1edd0..2787e0884 100644
--- a/pym/portage/process.py
+++ b/pym/portage/process.py
@@ -1,5 +1,5 @@
 # portage.py -- core Portage functionality
-# Copyright 1998-2009 Gentoo Foundation
+# Copyright 1998-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 
@@ -10,7 +10,6 @@ import traceback
 
 from portage import os
 from portage import _encodings
-from portage import _unicode_decode
 from portage import _unicode_encode
 import portage
 portage.proxy.lazyimport.lazyimport(globals(),
diff --git a/pym/portage/sets/base.py b/pym/portage/sets/base.py
index f3cf37359..cd9c08d32 100644
--- a/pym/portage/sets/base.py
+++ b/pym/portage/sets/base.py
@@ -1,10 +1,10 @@
-# Copyright 2007 Gentoo Foundation
+# Copyright 2007-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 import sys
 from portage.dep import Atom, ExtendedAtomDict, best_match_to_list, match_from_list
 from portage.exception import InvalidAtom
-from portage.versions import catsplit, cpv_getkey
+from portage.versions import cpv_getkey
 
 if sys.hexversion >= 0x3000000:
 	basestring = str
diff --git a/pym/portage/tests/dep/test_dep_getusedeps.py b/pym/portage/tests/dep/test_dep_getusedeps.py
index 05977b157..d2494f7b3 100644
--- a/pym/portage/tests/dep/test_dep_getusedeps.py
+++ b/pym/portage/tests/dep/test_dep_getusedeps.py
@@ -1,11 +1,10 @@
 # test_dep_getusedeps.py -- Portage Unit Testing Functionality
-# Copyright 2007 Gentoo Foundation
+# Copyright 2007-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from portage.tests import TestCase
 from portage.dep import dep_getusedeps
 
-import sys
 from portage.tests import test_cps, test_slots, test_versions, test_usedeps
 
 class DepGetUseDeps(TestCase):
diff --git a/pym/portage/tests/ebuild/test_pty_eof.py b/pym/portage/tests/ebuild/test_pty_eof.py
index a910f98b5..042227b67 100644
--- a/pym/portage/tests/ebuild/test_pty_eof.py
+++ b/pym/portage/tests/ebuild/test_pty_eof.py
@@ -1,7 +1,6 @@
-# Copyright 2009 Gentoo Foundation
+# Copyright 2009-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-import portage
 from portage.tests import TestCase
 from portage.util._pty import _can_test_pty_eof, _test_pty_eof
 
diff --git a/pym/portage/tests/resolver/test_required_use.py b/pym/portage/tests/resolver/test_required_use.py
index 8996ea05e..6835b33c7 100644
--- a/pym/portage/tests/resolver/test_required_use.py
+++ b/pym/portage/tests/resolver/test_required_use.py
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 from portage.tests import TestCase
-from portage.tests.resolver.ResolverPlayground import ResolverPlayground, ResolverPlaygroundTestCase
+#from portage.tests.resolver.ResolverPlayground import ResolverPlayground, ResolverPlaygroundTestCase
 
 class RequiredUSETestCase(TestCase):
 
diff --git a/pym/portage/tests/resolver/test_use_dep_defaults.py b/pym/portage/tests/resolver/test_use_dep_defaults.py
index 8f41e40c8..0ddcd3836 100644
--- a/pym/portage/tests/resolver/test_use_dep_defaults.py
+++ b/pym/portage/tests/resolver/test_use_dep_defaults.py
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 from portage.tests import TestCase
-from portage.tests.resolver.ResolverPlayground import ResolverPlayground, ResolverPlaygroundTestCase
+#from portage.tests.resolver.ResolverPlayground import ResolverPlayground, ResolverPlaygroundTestCase
 
 class UseDepDefaultsTestCase(TestCase):
 
diff --git a/pym/portage/tests/util/test_grabdict.py b/pym/portage/tests/util/test_grabdict.py
index 3bf719054..e62a75dcc 100644
--- a/pym/portage/tests/util/test_grabdict.py
+++ b/pym/portage/tests/util/test_grabdict.py
@@ -1,9 +1,9 @@
 # test_grabDict.py -- Portage Unit Testing Functionality
-# Copyright 2006 Gentoo Foundation
+# Copyright 2006-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from portage.tests import TestCase
-from portage.util import grabdict
+#from portage.util import grabdict
 
 class GrabDictTestCase(TestCase):
 	
diff --git a/pym/portage/versions.py b/pym/portage/versions.py
index 1db421a7e..e40866ef6 100644
--- a/pym/portage/versions.py
+++ b/pym/portage/versions.py
@@ -1,5 +1,5 @@
 # versions.py -- core Portage functionality
-# Copyright 1998-2006 Gentoo Foundation
+# Copyright 1998-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 __all__ = [
@@ -11,6 +11,7 @@ __all__ = [
 import re
 import warnings
 
+from portage.localization import _
 
 # \w is [a-zA-Z0-9_]
 
@@ -36,9 +37,6 @@ suffix_regexp = re.compile("^(alpha|beta|rc|pre|p)(\\d*)$")
 suffix_value = {"pre": -2, "p": 0, "alpha": -4, "beta": -3, "rc": -1}
 endversion_keys = ["pre", "p", "alpha", "beta", "rc"]
 
-from portage.exception import InvalidData
-from portage.localization import _
-
 def ververify(myver, silent=1):
 	if ver_regexp.match(myver):
 		return 1
diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index a6c24d862..e957c84b2 100644
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -23,7 +23,6 @@ __all__ = [
 import codecs
 import errno
 import logging
-import re
 import sys
 from portage import os
 from portage import subprocess_getstatusoutput