diff options
author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2010-08-29 23:27:15 +0200 |
---|---|---|
committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2010-08-29 23:27:15 +0200 |
commit | 99448ad46a019e967badae438e2483079b44f215 (patch) | |
tree | cefd6cee2bf72b4781f502350ec184cbc326ff26 /pym/portage | |
parent | d69e52365d0f11eb773dbc00533def6ba9ce1ad1 (diff) | |
download | portage-99448ad46a019e967badae438e2483079b44f215.tar.gz portage-99448ad46a019e967badae438e2483079b44f215.tar.bz2 portage-99448ad46a019e967badae438e2483079b44f215.zip |
Remove unused imports found by pylint.
Diffstat (limited to 'pym/portage')
-rw-r--r-- | pym/portage/_selinux.py | 3 | ||||
-rw-r--r-- | pym/portage/cache/metadata_overlay.py | 3 | ||||
-rw-r--r-- | pym/portage/cache/sqlite.py | 3 | ||||
-rw-r--r-- | pym/portage/checksum.py | 4 | ||||
-rw-r--r-- | pym/portage/data.py | 4 | ||||
-rw-r--r-- | pym/portage/dbapi/porttree.py | 3 | ||||
-rw-r--r-- | pym/portage/dbapi/vartree.py | 2 | ||||
-rw-r--r-- | pym/portage/dep/dep_check.py | 2 | ||||
-rw-r--r-- | pym/portage/elog/filtering.py | 4 | ||||
-rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 3 | ||||
-rw-r--r-- | pym/portage/package/ebuild/fetch.py | 2 | ||||
-rw-r--r-- | pym/portage/process.py | 3 | ||||
-rw-r--r-- | pym/portage/sets/base.py | 4 | ||||
-rw-r--r-- | pym/portage/tests/dep/test_dep_getusedeps.py | 3 | ||||
-rw-r--r-- | pym/portage/tests/ebuild/test_pty_eof.py | 3 | ||||
-rw-r--r-- | pym/portage/tests/resolver/test_required_use.py | 2 | ||||
-rw-r--r-- | pym/portage/tests/resolver/test_use_dep_defaults.py | 2 | ||||
-rw-r--r-- | pym/portage/tests/util/test_grabdict.py | 4 | ||||
-rw-r--r-- | pym/portage/versions.py | 6 |
19 files changed, 23 insertions, 37 deletions
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 |