[gentoo-portage-dev] [PATCH 01/18] lib/_emerge/actions.py: drop unused-import

[gentoo-portage-dev] [PATCH 01/18] lib/_emerge/actions.py: drop unused-import

[Aaron Bauman]

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/_emerge/actions.py | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py
index ab614d641..43e9de43a 100644
--- a/lib/_emerge/actions.py
+++ b/lib/_emerge/actions.py
@@ -4,7 +4,6 @@
 from __future__ import division, print_function
 
 import collections
-import errno
 import logging
 import operator
 import platform
@@ -34,24 +33,20 @@ portage.proxy.lazyimport.lazyimport(globals(),
 
 from portage import os
 from portage import shutil
-from portage import eapi_is_supported, _encodings, _unicode_decode
-from portage.cache.cache_errors import CacheError
-from portage.const import GLOBAL_CONFIG_PATH, VCS_DIRS, _DEPCLEAN_LIB_CHECK_DEFAULT
-from portage.const import SUPPORTED_BINPKG_FORMATS, TIMESTAMP_FORMAT
+from portage import _encodings, _unicode_decode
+from portage.const import _DEPCLEAN_LIB_CHECK_DEFAULT
 from portage.dbapi.dep_expand import dep_expand
 from portage.dbapi._expand_new_virt import expand_new_virt
 from portage.dbapi.IndexedPortdb import IndexedPortdb
 from portage.dbapi.IndexedVardb import IndexedVardb
 from portage.dep import Atom, _repo_separator, _slot_separator
-from portage.eclass_cache import hashed_path
 from portage.exception import InvalidAtom, InvalidData, ParseError
-from portage.output import blue, colorize, create_color_func, darkgreen, \
-	red, xtermTitle, xtermTitleReset, yellow
+from portage.output import colorize, create_color_func, darkgreen, \
+	red, xtermTitle, xtermTitleReset
 good = create_color_func("GOOD")
 bad = create_color_func("BAD")
 warn = create_color_func("WARN")
 from portage.package.ebuild._ipc.QueryCommand import QueryCommand
-from portage.package.ebuild.doebuild import _check_temp_dir
 from portage.package.ebuild.fetch import _hide_url_passwd
 from portage._sets import load_default_config, SETPREFIX
 from portage._sets.base import InternalPackageSet
@@ -69,17 +64,14 @@ from portage.metadata import action_metadata
 from portage.emaint.main import print_results
 
 from _emerge.clear_caches import clear_caches
-from _emerge.countdown import countdown
 from _emerge.create_depgraph_params import create_depgraph_params
 from _emerge.Dependency import Dependency
 from _emerge.depgraph import backtrack_depgraph, depgraph, resume_depgraph
-from _emerge.DepPrioritySatisfiedRange import DepPrioritySatisfiedRange
 from _emerge.emergelog import emergelog
 from _emerge.is_valid_package_atom import is_valid_package_atom
 from _emerge.main import profile_check
 from _emerge.MetadataRegen import MetadataRegen
 from _emerge.Package import Package
-from _emerge.ProgressHandler import ProgressHandler
 from _emerge.RootConfig import RootConfig
 from _emerge.Scheduler import Scheduler
 from _emerge.search import search
-- 
2.28.0

[gentoo-portage-dev] [PATCH 02/18] lib/portage/package/ebuild/_config/KeywordsManager.py: drop unused-import

[Aaron Bauman]

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/package/ebuild/_config/KeywordsManager.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/portage/package/ebuild/_config/KeywordsManager.py b/lib/portage/package/ebuild/_config/KeywordsManager.py
index 136f57c35..de9cdaede 100644
--- a/lib/portage/package/ebuild/_config/KeywordsManager.py
+++ b/lib/portage/package/ebuild/_config/KeywordsManager.py
@@ -7,13 +7,12 @@ __all__ = (
 
 import warnings
 
-from _emerge.Package import Package
 import portage
 from portage import os
-from portage.dep import ExtendedAtomDict, _repo_separator, _slot_separator
+from portage.dep import ExtendedAtomDict
 from portage.localization import _
 from portage.package.ebuild._config.helper import ordered_by_atom_specificity
-from portage.util import grabdict_package, stack_lists, writemsg
+from portage.util import grabdict_package, stack_lists
 from portage.versions import _pkg_str
 
 class KeywordsManager:
-- 
2.28.0

[gentoo-portage-dev] [PATCH 03/18] lib/portage/emaint/modules/sync/sync.py: drop unused-import

[Aaron Bauman]

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/emaint/modules/sync/sync.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/portage/emaint/modules/sync/sync.py b/lib/portage/emaint/modules/sync/sync.py
index a8da68065..ce9c0da39 100644
--- a/lib/portage/emaint/modules/sync/sync.py
+++ b/lib/portage/emaint/modules/sync/sync.py
@@ -6,16 +6,12 @@ import os
 import portage
 portage._internal_caller = True
 portage._sync_mode = True
-from portage.localization import _
 from portage.output import bold, red, create_color_func
 from portage._global_updates import _global_updates
 from portage.sync.controller import SyncManager
-from portage.util import writemsg_level
 from portage.util.digraph import digraph
 from portage.util.futures import asyncio
 from portage.util._async.AsyncScheduler import AsyncScheduler
-from portage.util._eventloop.global_event_loop import global_event_loop
-from portage.util._eventloop.EventLoop import EventLoop
 
 import _emerge
 from _emerge.emergelog import emergelog
-- 
2.28.0

[gentoo-portage-dev] [PATCH 04/18] lib/_emerge/resolver/slot_collision.py: drop unused-import

[Aaron Bauman]

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/_emerge/resolver/slot_collision.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/_emerge/resolver/slot_collision.py b/lib/_emerge/resolver/slot_collision.py
index 2b8f59953..7accb89f4 100644
--- a/lib/_emerge/resolver/slot_collision.py
+++ b/lib/_emerge/resolver/slot_collision.py
@@ -3,8 +3,6 @@
 
 from __future__ import print_function
 
-
-from portage import _encodings, _unicode_encode
 from _emerge.AtomArg import AtomArg
 from _emerge.Package import Package
 from _emerge.PackageArg import PackageArg
-- 
2.28.0

[gentoo-portage-dev] [PATCH 05/18] lib/_emerge/PollScheduler.py: drop unused-import

[Aaron Bauman]

* Drop unused-import
* Update copyright

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/_emerge/PollScheduler.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/_emerge/PollScheduler.py b/lib/_emerge/PollScheduler.py
index f51c5b005..89d940fed 100644
--- a/lib/_emerge/PollScheduler.py
+++ b/lib/_emerge/PollScheduler.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 try:
@@ -6,10 +6,8 @@ try:
 except ImportError:
 	import dummy_threading as threading
 
-import portage
 from portage.util.futures import asyncio
 from portage.util._async.SchedulerInterface import SchedulerInterface
-from portage.util._eventloop.EventLoop import EventLoop
 from portage.util._eventloop.global_event_loop import global_event_loop
 
 from _emerge.getloadavg import getloadavg
-- 
2.28.0

[gentoo-portage-dev] [PATCH 06/18] lib/portage/dep/soname/SonameAtom.py: drop unused-import

[Aaron Bauman]

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/dep/soname/SonameAtom.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/portage/dep/soname/SonameAtom.py b/lib/portage/dep/soname/SonameAtom.py
index 62b2ee5e1..9abdf6906 100644
--- a/lib/portage/dep/soname/SonameAtom.py
+++ b/lib/portage/dep/soname/SonameAtom.py
@@ -1,9 +1,6 @@
 # Copyright 2015-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-
-from portage import _encodings, _unicode_encode
-
 class SonameAtom:
 
 	__slots__ = ("multilib_category", "soname", "_hash_key",
-- 
2.28.0

[gentoo-portage-dev] [PATCH 07/18] lib/portage/dbapi/cpv_expand.py: drop unused-import

[Aaron Bauman]

* Drop unused import
* Update copyright

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/dbapi/cpv_expand.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/portage/dbapi/cpv_expand.py b/lib/portage/dbapi/cpv_expand.py
index a1a91f554..eeec446d4 100644
--- a/lib/portage/dbapi/cpv_expand.py
+++ b/lib/portage/dbapi/cpv_expand.py
@@ -1,12 +1,10 @@
-# Copyright 2010-2013 Gentoo Foundation
+# Copyright 2010-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 __all__ = ["cpv_expand"]
 
 import portage
 from portage.exception import AmbiguousPackageName
-from portage.localization import _
-from portage.util import writemsg
 from portage.versions import _pkgsplit
 
 def cpv_expand(mycpv, mydb=None, use_cache=1, settings=None):
-- 
2.28.0

[gentoo-portage-dev] [PATCH 08/18] lib/_emerge/EbuildBuild.py: drop unused-import

[Aaron Bauman]

* Drop unused-import
* Update copyright

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/_emerge/EbuildBuild.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/_emerge/EbuildBuild.py b/lib/_emerge/EbuildBuild.py
index 4da815988..d9c3aa974 100644
--- a/lib/_emerge/EbuildBuild.py
+++ b/lib/_emerge/EbuildBuild.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 import functools
@@ -18,7 +18,7 @@ from _emerge.MiscFunctionsProcess import MiscFunctionsProcess
 from _emerge.TaskSequence import TaskSequence
 
 import portage
-from portage import _encodings, _unicode_decode, _unicode_encode, os
+from portage import _encodings, os
 from portage.package.ebuild.digestcheck import digestcheck
 from portage.package.ebuild.doebuild import _check_temp_dir
 from portage.package.ebuild._spawn_nofetch import SpawnNofetchWithoutBuilddir
-- 
2.28.0

[gentoo-portage-dev] [PATCH 09/18] lib/portage/_emirrordist/Config.py: drop unused-import

[Aaron Bauman]

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/_emirrordist/Config.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/portage/_emirrordist/Config.py b/lib/portage/_emirrordist/Config.py
index 56732089e..4bee4f45e 100644
--- a/lib/portage/_emirrordist/Config.py
+++ b/lib/portage/_emirrordist/Config.py
@@ -7,7 +7,6 @@ import logging
 import shelve
 import time
 
-import portage
 from portage import os
 from portage.package.ebuild.fetch import MirrorLayoutConfig
 from portage.util import grabdict, grablines
-- 
2.28.0

[gentoo-portage-dev] [PATCH 10/18] lib/portage/dbapi/IndexedPortdb.py: drop unused-import

[Aaron Bauman]

* Drop unused-import
* Update copyright

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/dbapi/IndexedPortdb.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/portage/dbapi/IndexedPortdb.py b/lib/portage/dbapi/IndexedPortdb.py
index 5f1cb5bd1..8d9ba89ff 100644
--- a/lib/portage/dbapi/IndexedPortdb.py
+++ b/lib/portage/dbapi/IndexedPortdb.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Gentoo Foundation
+# Copyright 2014-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 import errno
@@ -15,7 +15,6 @@ from portage.cache.index.IndexStreamIterator import IndexStreamIterator
 from portage.cache.index.pkg_desc_index import \
 	pkg_desc_index_line_read, pkg_desc_index_node
 from portage.util.iterators.MultiIterGroupBy import MultiIterGroupBy
-from portage.versions import _pkg_str
 
 class IndexedPortdb:
 	"""
-- 
2.28.0

[gentoo-portage-dev] [PATCH 11/18] lib/portage/elog/mod_syslog.py: drop unused-import

[Aaron Bauman]

* Drop unused-import
* Update copyright

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/elog/mod_syslog.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/portage/elog/mod_syslog.py b/lib/portage/elog/mod_syslog.py
index 4dabacc52..caf6c1f08 100644
--- a/lib/portage/elog/mod_syslog.py
+++ b/lib/portage/elog/mod_syslog.py
@@ -1,11 +1,9 @@
 # elog/mod_syslog.py - elog dispatch module
-# Copyright 2006-2014 Gentoo Foundation
+# Copyright 2006-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 import syslog
 from portage.const import EBUILD_PHASES
-from portage import _encodings
-
 
 _pri = {
 	"INFO"   : syslog.LOG_INFO,
-- 
2.28.0

[gentoo-portage-dev] [PATCH 12/18] lib/portage/package/ebuild/prepare_build_dirs.py: drop unused-import

[Aaron Bauman]

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/package/ebuild/prepare_build_dirs.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/portage/package/ebuild/prepare_build_dirs.py b/lib/portage/package/ebuild/prepare_build_dirs.py
index b63cd89fa..080d5309f 100644
--- a/lib/portage/package/ebuild/prepare_build_dirs.py
+++ b/lib/portage/package/ebuild/prepare_build_dirs.py
@@ -18,7 +18,6 @@ from portage.output import colorize
 from portage.util import apply_recursive_permissions, \
 	apply_secpass_permissions, ensure_dirs, normalize_path, writemsg
 from portage.util.install_mask import _raise_exc
-from portage.const import EPREFIX
 
 def prepare_build_dirs(myroot=None, settings=None, cleanup=False):
 	"""
-- 
2.28.0

[gentoo-portage-dev] [PATCH 13/18] lib/portage/package/ebuild/getmaskingreason.py: drop unused-import

[Aaron Bauman]

* Drop unused-import
* Update copyright

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/package/ebuild/getmaskingreason.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/portage/package/ebuild/getmaskingreason.py b/lib/portage/package/ebuild/getmaskingreason.py
index 22232de29..9cda20456 100644
--- a/lib/portage/package/ebuild/getmaskingreason.py
+++ b/lib/portage/package/ebuild/getmaskingreason.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2014 Gentoo Foundation
+# Copyright 2010-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 __all__ = ['getmaskingreason']
@@ -10,7 +10,7 @@ from portage.dep import Atom, match_from_list
 from portage.exception import InvalidAtom
 from portage.localization import _
 from portage.repository.config import _gen_valid_repo
-from portage.util import grablines, normalize_path
+from portage.util import grablines
 from portage.versions import catpkgsplit, _pkg_str
 
 def getmaskingreason(mycpv, metadata=None, settings=None,
-- 
2.28.0

[gentoo-portage-dev] [PATCH 14/18] lib/portage/tests/resolver/ResolverPlayground.py: drop unused-import

[Aaron Bauman]

* Drop unused-import
* Slight refactor on imports

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/tests/resolver/ResolverPlayground.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/portage/tests/resolver/ResolverPlayground.py b/lib/portage/tests/resolver/ResolverPlayground.py
index b15cc7f36..1e382002a 100644
--- a/lib/portage/tests/resolver/ResolverPlayground.py
+++ b/lib/portage/tests/resolver/ResolverPlayground.py
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 import bz2
-from itertools import permutations
 import fnmatch
 import tempfile
 import portage
+
+from itertools import permutations
 from portage import os
 from portage import shutil
-from portage.const import (GLOBAL_CONFIG_PATH, PORTAGE_BASE_PATH,
-	USER_CONFIG_PATH)
+from portage.const import (GLOBAL_CONFIG_PATH, USER_CONFIG_PATH)
 from portage.process import find_binary
 from portage.dep import Atom, _repo_separator
 from portage.package.ebuild.config import config
-- 
2.28.0

[gentoo-portage-dev] [PATCH 15/18] lib/portage/tests/util/test_getconfig.py: drop unused-import

[Aaron Bauman]

* Drop unused-import
* Update copyright

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/tests/util/test_getconfig.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/portage/tests/util/test_getconfig.py b/lib/portage/tests/util/test_getconfig.py
index a0d00d0e1..90e039cba 100644
--- a/lib/portage/tests/util/test_getconfig.py
+++ b/lib/portage/tests/util/test_getconfig.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2019 Gentoo Authors
+# Copyright 2010-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 import tempfile
@@ -6,7 +6,6 @@ import tempfile
 from portage import os
 from portage import shutil
 from portage import _unicode_encode
-from portage.const import PORTAGE_BASE_PATH
 from portage.tests import TestCase
 from portage.util import getconfig
 from portage.exception import ParseError
-- 
2.28.0

[gentoo-portage-dev] [PATCH 16/18] lib/portage/tests/util/eventloop/test_call_soon_fifo.py: drop unused-import

[Aaron Bauman]

* Drop unused-import
* Update copyright

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/tests/util/eventloop/test_call_soon_fifo.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/portage/tests/util/eventloop/test_call_soon_fifo.py b/lib/portage/tests/util/eventloop/test_call_soon_fifo.py
index f970c67a1..2b809c2e1 100644
--- a/lib/portage/tests/util/eventloop/test_call_soon_fifo.py
+++ b/lib/portage/tests/util/eventloop/test_call_soon_fifo.py
@@ -1,14 +1,12 @@
-# Copyright 2017 Gentoo Foundation
+# Copyright 2017-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 import functools
 import random
 
-from portage import os
 from portage.tests import TestCase
 from portage.util._eventloop.global_event_loop import global_event_loop
 
-
 class CallSoonFifoTestCase(TestCase):
 
 	def testCallSoonFifo(self):
-- 
2.28.0

[gentoo-portage-dev] [PATCH 17/18] lib/portage/util/netlink.py: drop unused-import

[Aaron Bauman]

* Drop unused-import
* Update copyright

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/util/netlink.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/portage/util/netlink.py b/lib/portage/util/netlink.py
index 950ed8f69..ad9e8ca30 100644
--- a/lib/portage/util/netlink.py
+++ b/lib/portage/util/netlink.py
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 from io import BytesIO
@@ -8,7 +8,6 @@ from struct import Struct
 import socket
 from socket import (
 	AF_NETLINK, AF_UNSPEC,
-	MSG_PEEK, MSG_TRUNC,
 	NETLINK_ROUTE,
 	SOCK_DGRAM,
 	inet_pton,
-- 
2.28.0

[gentoo-portage-dev] [PATCH 18/18] pylintrc: enable unused-imports

[Aaron Bauman]

* Repo is now clear of unused-imports... so turn it on by default

Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 pylintrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pylintrc b/pylintrc
index 19f59c165..6f0eef386 100644
--- a/pylintrc
+++ b/pylintrc
@@ -12,7 +12,7 @@
 # --disable=W".
 #disable=no-absolute-import,bad-continuation,C0103,C0114,C0115,E1101,W0201,no-name-in-module
 disable=all
-enable=redefined-builtin,useless-object-inheritance,trailing-newlines
+enable=redefined-builtin,useless-object-inheritance,trailing-newlines,unused-import
 
 # A comma-separated list of package or module names from where C extensions may
 # be loaded. Extensions are loading into the active Python interpreter and may
-- 
2.28.0

Re: [gentoo-portage-dev] [PATCH 18/18] pylintrc: enable unused-imports

[Zac Medico]

[-- Attachment #1.1: Type: text/plain, Size: 999 bytes --]

On 8/3/20 1:20 PM, Aaron Bauman wrote:
> * Repo is now clear of unused-imports... so turn it on by default
> 
> Signed-off-by: Aaron Bauman <bman@gentoo.org>
> ---
>  pylintrc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/pylintrc b/pylintrc
> index 19f59c165..6f0eef386 100644
> --- a/pylintrc
> +++ b/pylintrc
> @@ -12,7 +12,7 @@
>  # --disable=W".
>  #disable=no-absolute-import,bad-continuation,C0103,C0114,C0115,E1101,W0201,no-name-in-module
>  disable=all
> -enable=redefined-builtin,useless-object-inheritance,trailing-newlines
> +enable=redefined-builtin,useless-object-inheritance,trailing-newlines,unused-import
>  
>  # A comma-separated list of package or module names from where C extensions may
>  # be loaded. Extensions are loading into the active Python interpreter and may
> 

Thanks, merged the whole series:

https://gitweb.gentoo.org/proj/portage.git/commit/?id=a8eb52efa1364044bb8dd426b1691ef19f08f595
-- 
Thanks,
Zac


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 981 bytes --]