can/ebuild/__init__.py repoman/lib/repoman/modules/scan/eclasses/__init__.py repoman/lib/repoman/modules/scan/fetch/__init__.py repoman/lib/repoman/modules/scan/keywords/__init__.py repoman/lib/repoman/modules/scan/manifest/__init__.py repoman/lib/repoman/modules/scan/metadata/__init__.py repoman/lib/repoman/modules/scan/metadata/ebuild_metadata.py repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py repoman/lib/repoman/modules/scan/metadata/restrict.py repoman/lib/repoman/modules/scan/options/__init__.py repoman/lib/repoman/modules/vcs/None/status.py repoman/lib/repoman/modules/vcs/__init__.py repoman/lib/repoman/modules/vcs/bzr/changes.py repoman/lib/repoman/modules/vcs/bzr/status.py repoman/lib/repoman/modules/vcs/cvs/status.py repoman/lib/repoman/modules/vcs/git/changes.py repoman/lib/repoman/modules/vcs/git/status.py repoman/lib/repoman/modules/vcs/hg/changes.py repoman/lib/repoman/modules/vcs/hg/status.py repoman/lib/repoman/modules/vcs/svn/changes.py repoman/lib/repoman/mo dules/vcs/svn/status.py repoman/lib/repoman/modules/vcs/vcs.py repoman/lib/repoman/repos.py repoman/lib/repoman/tests/commit/__test__.py repoman/lib/repoman/tests/runTests.py repoman/lib/repoman/tests/simple/__test__.py repoman/lib/repoman/tests/simple/test_simple.py repoman/lib/repoman/utilities.py X-VCS-Directories: repoman/lib/repoman/modules/scan/metadata/ repoman/lib/repoman/modules/scan/depend/ repoman/lib/repoman/modules/linechecks/quotes/ repoman/lib/repoman/modules/scan/fetch/ repoman/lib/repoman/modules/linechecks/depend/ repoman/lib/repoman/modules/scan/directories/ repoman/lib/repoman/modules/scan/eclasses/ repoman/lib/repoman/modules/scan/ebuild/ repoman/lib/repoman/modules/linechecks/whitespace/ repoman/lib/repoman/modules/linechecks/eapi/ repoman/lib/repoman/modules/scan/keywords/ repoman/lib/repoman/modules/linechecks/useless/ repoman/lib/repoman/modules/vcs/cvs/ repoman/lib/repoman/tests/commit/ repoman/lib/repoman/modules/linechecks/deprecated/ repoman/lib/repoman/modules/linechecks/gentoo_header/ repoman/lib/repoman/modules/linechecks/patches/ repoman/lib/repoman/ repoman/lib/repoman/tests/simple/ repoman/lib/repoman/modules/vcs/None/ repoman/lib/repoman/modules/vcs/svn/ repoman/lib/repoman/modules/linechecks/portage/ repoman/lib/repoman/modules/vcs/git/ repom an/lib/repoman/modules/scan/options/ repoman/lib/repoman/modules/commit/ repoman/lib/repoman/modules/linechecks/ repoman/lib/repoman/modules/linechecks/do/ repoman/lib/repoman/modules/linechecks/use/ repoman/lib/repoman/modules/vcs/ repoman/lib/repoman/modules/linechecks/nested/ repoman/lib/repoman/modules/linechecks/workaround/ repoman/lib/repoman/tests/ repoman/lib/repoman/modules/linechecks/phases/ repoman/lib/repoman/modules/linechecks/uri/ repoman/lib/repoman/modules/linechecks/helpers/ repoman/lib/repoman/modules/scan/eapi/ repoman/lib/repoman/modules/scan/manifest/ repoman/lib/repoman/modules/linechecks/emake/ repoman/lib/repoman/modules/linechecks/assignment/ repoman/lib/repoman/modules/vcs/hg/ repoman/lib/repoman/modules/vcs/bzr/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: fd216bba8b60335f8ee0119a350dd22ce65331b3 X-VCS-Branch: master Date: Tue, 19 Jan 2021 07:28:40 +0000 (UTC)
commit: fd216bba8b60335f8ee0119a350dd22ce65331b3 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Tue Jan 19 07:05:46 2021 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Tue Jan 19 07:06:01 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=fd216bba repoman: misc pylint fixes Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> repoman/lib/repoman/_subprocess.py | 4 ---- repoman/lib/repoman/actions.py | 3 ++- repoman/lib/repoman/config.py | 5 ---- repoman/lib/repoman/gpg.py | 2 -- repoman/lib/repoman/main.py | 3 ++- repoman/lib/repoman/metadata.py | 1 - repoman/lib/repoman/modules/commit/manifest.py | 1 - repoman/lib/repoman/modules/commit/repochecks.py | 1 - repoman/lib/repoman/modules/linechecks/__init__.py | 1 - .../modules/linechecks/assignment/__init__.py | 3 +-- .../repoman/modules/linechecks/depend/__init__.py | 3 +-- .../modules/linechecks/deprecated/__init__.py | 3 +-- .../modules/linechecks/deprecated/deprecated.py | 2 +- .../lib/repoman/modules/linechecks/do/__init__.py | 3 +-- .../repoman/modules/linechecks/eapi/__init__.py | 3 +-- .../repoman/modules/linechecks/emake/__init__.py | 3 +-- .../modules/linechecks/gentoo_header/__init__.py | 3 +-- .../repoman/modules/linechecks/helpers/__init__.py | 3 +-- .../repoman/modules/linechecks/helpers/offset.py | 2 +- .../repoman/modules/linechecks/nested/__init__.py | 3 +-- .../repoman/modules/linechecks/patches/__init__.py | 3 +-- .../repoman/modules/linechecks/patches/patches.py | 3 +-- .../repoman/modules/linechecks/phases/__init__.py | 3 +-- .../repoman/modules/linechecks/portage/__init__.py | 3 +-- .../repoman/modules/linechecks/quotes/__init__.py | 3 +-- .../lib/repoman/modules/linechecks/uri/__init__.py | 3 +-- repoman/lib/repoman/modules/linechecks/uri/uri.py | 28 +++++++++++----------- .../lib/repoman/modules/linechecks/use/__init__.py | 3 +-- .../repoman/modules/linechecks/use/builtwith.py | 2 +- .../repoman/modules/linechecks/useless/__init__.py | 3 +-- .../modules/linechecks/whitespace/__init__.py | 3 +-- .../modules/linechecks/workaround/__init__.py | 3 +-- .../modules/linechecks/workaround/workarounds.py | 2 +- .../lib/repoman/modules/scan/depend/__init__.py | 3 +-- .../repoman/modules/scan/depend/_depend_checks.py | 4 ++-- repoman/lib/repoman/modules/scan/depend/profile.py | 2 +- .../repoman/modules/scan/directories/__init__.py | 3 +-- repoman/lib/repoman/modules/scan/eapi/__init__.py | 3 +-- .../lib/repoman/modules/scan/ebuild/__init__.py | 3 +-- .../lib/repoman/modules/scan/eclasses/__init__.py | 3 +-- repoman/lib/repoman/modules/scan/fetch/__init__.py | 3 +-- .../lib/repoman/modules/scan/keywords/__init__.py | 3 +-- .../lib/repoman/modules/scan/manifest/__init__.py | 3 +-- .../lib/repoman/modules/scan/metadata/__init__.py | 3 +-- .../modules/scan/metadata/ebuild_metadata.py | 1 - .../repoman/modules/scan/metadata/pkgmetadata.py | 3 ++- .../lib/repoman/modules/scan/metadata/restrict.py | 1 - .../lib/repoman/modules/scan/options/__init__.py | 3 +-- repoman/lib/repoman/modules/vcs/None/status.py | 1 - repoman/lib/repoman/modules/vcs/__init__.py | 1 - repoman/lib/repoman/modules/vcs/bzr/changes.py | 2 +- repoman/lib/repoman/modules/vcs/bzr/status.py | 2 ++ repoman/lib/repoman/modules/vcs/cvs/status.py | 2 +- repoman/lib/repoman/modules/vcs/git/changes.py | 3 ++- repoman/lib/repoman/modules/vcs/git/status.py | 3 ++- repoman/lib/repoman/modules/vcs/hg/changes.py | 3 ++- repoman/lib/repoman/modules/vcs/hg/status.py | 2 ++ repoman/lib/repoman/modules/vcs/svn/changes.py | 2 -- repoman/lib/repoman/modules/vcs/svn/status.py | 1 + repoman/lib/repoman/modules/vcs/vcs.py | 2 -- repoman/lib/repoman/repos.py | 1 + repoman/lib/repoman/tests/commit/__test__.py | 1 - repoman/lib/repoman/tests/runTests.py | 8 +++---- repoman/lib/repoman/tests/simple/__test__.py | 1 - repoman/lib/repoman/tests/simple/test_simple.py | 4 +++- repoman/lib/repoman/utilities.py | 6 ++--- 66 files changed, 80 insertions(+), 120 deletions(-) diff --git a/repoman/lib/repoman/_subprocess.py b/repoman/lib/repoman/_subprocess.py index 2ca434010..77b0dbd2a 100644 --- a/repoman/lib/repoman/_subprocess.py +++ b/repoman/lib/repoman/_subprocess.py @@ -3,13 +3,9 @@ import codecs import subprocess -import sys # import our initialized portage instance from repoman._portage import portage - -from portage import os -from portage.process import find_binary from portage import _encodings, _unicode_encode diff --git a/repoman/lib/repoman/actions.py b/repoman/lib/repoman/actions.py index 6f7313386..0f89572b9 100644 --- a/repoman/lib/repoman/actions.py +++ b/repoman/lib/repoman/actions.py @@ -1,5 +1,5 @@ # -*- coding:utf-8 -*- -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import errno @@ -30,6 +30,7 @@ from portage.output import ( from portage.package.ebuild.digestgen import digestgen from portage.util import writemsg_level +# pylint: disable=ungrouped-imports from repoman.copyrights import update_copyright from repoman.gpg import gpgsign, need_signature from repoman import utilities diff --git a/repoman/lib/repoman/config.py b/repoman/lib/repoman/config.py index decf9b90a..57a550952 100644 --- a/repoman/lib/repoman/config.py +++ b/repoman/lib/repoman/config.py @@ -11,11 +11,6 @@ try: except ImportError: yaml = None -try: - FileNotFoundError -except NameError: - FileNotFoundError = EnvironmentError - class ConfigError(Exception): """Raised when a config file fails to load""" diff --git a/repoman/lib/repoman/gpg.py b/repoman/lib/repoman/gpg.py index ba16ab75b..51717f2ad 100644 --- a/repoman/lib/repoman/gpg.py +++ b/repoman/lib/repoman/gpg.py @@ -3,14 +3,12 @@ import errno import logging import subprocess -import sys import portage from portage import os from portage import _encodings from portage import _unicode_encode from portage.exception import MissingParameter -from portage.process import find_binary # Setup the GPG commands diff --git a/repoman/lib/repoman/main.py b/repoman/lib/repoman/main.py index 28a0d8a60..50b99c21f 100755 --- a/repoman/lib/repoman/main.py +++ b/repoman/lib/repoman/main.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding:utf-8 -*- -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import io @@ -25,6 +25,7 @@ from portage.util.futures.extendedfutures import ( ExtendedFuture, ) +# pylint: disable=ungrouped-imports from repoman.actions import Actions from repoman.argparser import parse_args from repoman.qa_data import QAData diff --git a/repoman/lib/repoman/metadata.py b/repoman/lib/repoman/metadata.py index f255a61e8..4a0ae56e3 100644 --- a/repoman/lib/repoman/metadata.py +++ b/repoman/lib/repoman/metadata.py @@ -2,7 +2,6 @@ import errno import logging -import sys import time # import our initialized portage instance diff --git a/repoman/lib/repoman/modules/commit/manifest.py b/repoman/lib/repoman/modules/commit/manifest.py index e71c1abcb..6c683da52 100644 --- a/repoman/lib/repoman/modules/commit/manifest.py +++ b/repoman/lib/repoman/modules/commit/manifest.py @@ -1,7 +1,6 @@ # -*- coding:utf-8 -*- import logging -import sys # import our initialized portage instance from repoman._portage import portage diff --git a/repoman/lib/repoman/modules/commit/repochecks.py b/repoman/lib/repoman/modules/commit/repochecks.py index 1a287f978..4d267fb76 100644 --- a/repoman/lib/repoman/modules/commit/repochecks.py +++ b/repoman/lib/repoman/modules/commit/repochecks.py @@ -30,4 +30,3 @@ def commit_check(repolevel, reposplit): def conflict_check(vcs_settings, options): if vcs_settings.vcs: conflicts = vcs_settings.status.detect_conflicts(options) - diff --git a/repoman/lib/repoman/modules/linechecks/__init__.py b/repoman/lib/repoman/modules/linechecks/__init__.py index 8b1378917..e69de29bb 100644 --- a/repoman/lib/repoman/modules/linechecks/__init__.py +++ b/repoman/lib/repoman/modules/linechecks/__init__.py @@ -1 +0,0 @@ - diff --git a/repoman/lib/repoman/modules/linechecks/assignment/__init__.py b/repoman/lib/repoman/modules/linechecks/assignment/__init__.py index b95a25a74..5cb9bfde0 100644 --- a/repoman/lib/repoman/modules/linechecks/assignment/__init__.py +++ b/repoman/lib/repoman/modules/linechecks/assignment/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Assignment plug-in module for repoman LineChecks. @@ -25,4 +25,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/linechecks/depend/__init__.py b/repoman/lib/repoman/modules/linechecks/depend/__init__.py index 2ea95347e..fb310686b 100644 --- a/repoman/lib/repoman/modules/linechecks/depend/__init__.py +++ b/repoman/lib/repoman/modules/linechecks/depend/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Depend plug-in module for repoman LineChecks. @@ -19,4 +19,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/linechecks/deprecated/__init__.py b/repoman/lib/repoman/modules/linechecks/deprecated/__init__.py index 258683345..c5566dc1e 100644 --- a/repoman/lib/repoman/modules/linechecks/deprecated/__init__.py +++ b/repoman/lib/repoman/modules/linechecks/deprecated/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Deprecated plug-in module for repoman LineChecks. @@ -44,4 +44,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/linechecks/deprecated/deprecated.py b/repoman/lib/repoman/modules/linechecks/deprecated/deprecated.py index b33852e74..d1a590f1d 100644 --- a/repoman/lib/repoman/modules/linechecks/deprecated/deprecated.py +++ b/repoman/lib/repoman/modules/linechecks/deprecated/deprecated.py @@ -1,5 +1,5 @@ -import re +import re # pylint: disable=unused-import from repoman.modules.linechecks.base import LineCheck diff --git a/repoman/lib/repoman/modules/linechecks/do/__init__.py b/repoman/lib/repoman/modules/linechecks/do/__init__.py index dc5af701c..88ac96456 100644 --- a/repoman/lib/repoman/modules/linechecks/do/__init__.py +++ b/repoman/lib/repoman/modules/linechecks/do/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Do plug-in module for repoman LineChecks. @@ -19,4 +19,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/linechecks/eapi/__init__.py b/repoman/lib/repoman/modules/linechecks/eapi/__init__.py index 31993df20..cb41d54d0 100644 --- a/repoman/lib/repoman/modules/linechecks/eapi/__init__.py +++ b/repoman/lib/repoman/modules/linechecks/eapi/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Eapi plug-in module for repoman LineChecks. @@ -49,4 +49,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/linechecks/emake/__init__.py b/repoman/lib/repoman/modules/linechecks/emake/__init__.py index cecdc5fcf..44a943d62 100644 --- a/repoman/lib/repoman/modules/linechecks/emake/__init__.py +++ b/repoman/lib/repoman/modules/linechecks/emake/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Emake plug-in module for repoman LineChecks. @@ -25,4 +25,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/linechecks/gentoo_header/__init__.py b/repoman/lib/repoman/modules/linechecks/gentoo_header/__init__.py index 205cc32c2..f57be7dae 100644 --- a/repoman/lib/repoman/modules/linechecks/gentoo_header/__init__.py +++ b/repoman/lib/repoman/modules/linechecks/gentoo_header/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Gentoo-header plug-in module for repoman LineChecks. @@ -19,4 +19,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/linechecks/helpers/__init__.py b/repoman/lib/repoman/modules/linechecks/helpers/__init__.py index 0f41f0136..a4ef45cd4 100644 --- a/repoman/lib/repoman/modules/linechecks/helpers/__init__.py +++ b/repoman/lib/repoman/modules/linechecks/helpers/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Helpers plug-in module for repoman LineChecks. @@ -19,4 +19,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/linechecks/helpers/offset.py b/repoman/lib/repoman/modules/linechecks/helpers/offset.py index 5d7624a68..743f57fd0 100644 --- a/repoman/lib/repoman/modules/linechecks/helpers/offset.py +++ b/repoman/lib/repoman/modules/linechecks/helpers/offset.py @@ -1,5 +1,5 @@ -import re +import re # pylint: disable=unused-import from repoman.modules.linechecks.base import LineCheck diff --git a/repoman/lib/repoman/modules/linechecks/nested/__init__.py b/repoman/lib/repoman/modules/linechecks/nested/__init__.py index 6c8a70a52..6f5a39fee 100644 --- a/repoman/lib/repoman/modules/linechecks/nested/__init__.py +++ b/repoman/lib/repoman/modules/linechecks/nested/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Nested plug-in module for repoman LineChecks. @@ -19,4 +19,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/linechecks/patches/__init__.py b/repoman/lib/repoman/modules/linechecks/patches/__init__.py index 4fe0fcf5e..c9d0e60b0 100644 --- a/repoman/lib/repoman/modules/linechecks/patches/__init__.py +++ b/repoman/lib/repoman/modules/linechecks/patches/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Patches plug-in module for repoman LineChecks. @@ -19,4 +19,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/linechecks/patches/patches.py b/repoman/lib/repoman/modules/linechecks/patches/patches.py index b360805db..8ad8a736c 100644 --- a/repoman/lib/repoman/modules/linechecks/patches/patches.py +++ b/repoman/lib/repoman/modules/linechecks/patches/patches.py @@ -1,6 +1,5 @@ - -import re +import re # pylint: disable=unused-import from repoman.modules.linechecks.base import LineCheck diff --git a/repoman/lib/repoman/modules/linechecks/phases/__init__.py b/repoman/lib/repoman/modules/linechecks/phases/__init__.py index b3228c0f7..686c675d2 100644 --- a/repoman/lib/repoman/modules/linechecks/phases/__init__.py +++ b/repoman/lib/repoman/modules/linechecks/phases/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Phases plug-in module for repoman LineChecks. @@ -32,4 +32,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/linechecks/portage/__init__.py b/repoman/lib/repoman/modules/linechecks/portage/__init__.py index b9a84b507..dc3243c35 100644 --- a/repoman/lib/repoman/modules/linechecks/portage/__init__.py +++ b/repoman/lib/repoman/modules/linechecks/portage/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Portage plug-in module for repoman LineChecks. @@ -25,4 +25,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/linechecks/quotes/__init__.py b/repoman/lib/repoman/modules/linechecks/quotes/__init__.py index 894ef58d2..2138946b7 100644 --- a/repoman/lib/repoman/modules/linechecks/quotes/__init__.py +++ b/repoman/lib/repoman/modules/linechecks/quotes/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Nested plug-in module for repoman LineChecks. @@ -25,4 +25,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/linechecks/uri/__init__.py b/repoman/lib/repoman/modules/linechecks/uri/__init__.py index e19617257..c7359d241 100644 --- a/repoman/lib/repoman/modules/linechecks/uri/__init__.py +++ b/repoman/lib/repoman/modules/linechecks/uri/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Uri plug-in module for repoman LineChecks. @@ -19,4 +19,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/linechecks/uri/uri.py b/repoman/lib/repoman/modules/linechecks/uri/uri.py index 1a0afe682..2fea7a313 100644 --- a/repoman/lib/repoman/modules/linechecks/uri/uri.py +++ b/repoman/lib/repoman/modules/linechecks/uri/uri.py @@ -1,5 +1,5 @@ -import re +import re # pylint: disable=unused-import from repoman.modules.linechecks.base import LineCheck @@ -8,21 +8,21 @@ class UriUseHttps(LineCheck): """Check that we use https:// for known good sites.""" repoman_check_name = 'uri.https' _SITES = ( - '([-._a-zA-Z0-9]*\.)?apache\.org', - '((alioth|packages(\.qa)?|people|www)\.)?debian\.org', + r'([-._a-zA-Z0-9]*\.)?apache\.org', + r'((alioth|packages(\.qa)?|people|www)\.)?debian\.org', # Most FDO sites support https, but not all (like tango). # List the most common ones here for now. - '((anongit|bugs|cgit|dri|patchwork|people|specifications|www|xcb|xorg)\.)?freedesktop\.org', - '((bugs|dev|wiki|www)\.)?gentoo\.org', - '((wiki)\.)?github\.(io|com)', - 'savannah\.(non)?gnu\.org', - '((gcc|www)\.)?gnu\.org', - 'curl\.haxx\.se', - '((bugzilla|git|mirrors|patchwork|planet|www(\.wiki)?)\.)?kernel\.org', - '((bugs|wiki|www)\.)?linuxfoundation\.org', - '((docs|pypi|www)\.)?python\.org', - '(sf|sourceforge)\.net', - '(www\.)?(enlightenment|sourceware|x)\.org', + r'((anongit|bugs|cgit|dri|patchwork|people|specifications|www|xcb|xorg)\.)?freedesktop\.org', + r'((bugs|dev|wiki|www)\.)?gentoo\.org', + r'((wiki)\.)?github\.(io|com)', + r'savannah\.(non)?gnu\.org', + r'((gcc|www)\.)?gnu\.org', + r'curl\.haxx\.se', + r'((bugzilla|git|mirrors|patchwork|planet|www(\.wiki)?)\.)?kernel\.org', + r'((bugs|wiki|www)\.)?linuxfoundation\.org', + r'((docs|pypi|www)\.)?python\.org', + r'(sf|sourceforge)\.net', + r'(www\.)?(enlightenment|sourceware|x)\.org', ) # Try to anchor the end of the URL so we don't get false positives # with http://github.com.foo.bar.com/. Unlikely, but possible. diff --git a/repoman/lib/repoman/modules/linechecks/use/__init__.py b/repoman/lib/repoman/modules/linechecks/use/__init__.py index e97b0d61d..878985f1b 100644 --- a/repoman/lib/repoman/modules/linechecks/use/__init__.py +++ b/repoman/lib/repoman/modules/linechecks/use/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Use plug-in module for repoman LineChecks. @@ -19,4 +19,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/linechecks/use/builtwith.py b/repoman/lib/repoman/modules/linechecks/use/builtwith.py index 0ec4fae21..59d46232c 100644 --- a/repoman/lib/repoman/modules/linechecks/use/builtwith.py +++ b/repoman/lib/repoman/modules/linechecks/use/builtwith.py @@ -1,5 +1,5 @@ -import re +import re # pylint: disable=unused-import from repoman.modules.linechecks.base import LineCheck diff --git a/repoman/lib/repoman/modules/linechecks/useless/__init__.py b/repoman/lib/repoman/modules/linechecks/useless/__init__.py index 5cf978137..1198618da 100644 --- a/repoman/lib/repoman/modules/linechecks/useless/__init__.py +++ b/repoman/lib/repoman/modules/linechecks/useless/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Useless plug-in module for repoman LineChecks. @@ -25,4 +25,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/linechecks/whitespace/__init__.py b/repoman/lib/repoman/modules/linechecks/whitespace/__init__.py index 716c5129c..0c8422119 100644 --- a/repoman/lib/repoman/modules/linechecks/whitespace/__init__.py +++ b/repoman/lib/repoman/modules/linechecks/whitespace/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Whitespace plug-in module for repoman LineChecks. @@ -25,4 +25,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/linechecks/workaround/__init__.py b/repoman/lib/repoman/modules/linechecks/workaround/__init__.py index 694695015..364fde43c 100644 --- a/repoman/lib/repoman/modules/linechecks/workaround/__init__.py +++ b/repoman/lib/repoman/modules/linechecks/workaround/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Workaround plug-in module for repoman LineChecks. @@ -19,4 +19,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/linechecks/workaround/workarounds.py b/repoman/lib/repoman/modules/linechecks/workaround/workarounds.py index 768a47e8e..d124cbd9e 100644 --- a/repoman/lib/repoman/modules/linechecks/workaround/workarounds.py +++ b/repoman/lib/repoman/modules/linechecks/workaround/workarounds.py @@ -1,5 +1,5 @@ -import re +import re # pylint: disable=unused-import from repoman.modules.linechecks.base import LineCheck diff --git a/repoman/lib/repoman/modules/scan/depend/__init__.py b/repoman/lib/repoman/modules/scan/depend/__init__.py index 9068760bb..6cdd82015 100644 --- a/repoman/lib/repoman/modules/scan/depend/__init__.py +++ b/repoman/lib/repoman/modules/scan/depend/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Depend plug-in module for repoman. @@ -32,4 +32,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/scan/depend/_depend_checks.py b/repoman/lib/repoman/modules/scan/depend/_depend_checks.py index e01024da2..d0a61924e 100644 --- a/repoman/lib/repoman/modules/scan/depend/_depend_checks.py +++ b/repoman/lib/repoman/modules/scan/depend/_depend_checks.py @@ -63,8 +63,8 @@ def _depend_checks(ebuild, pkg, portdb, qatracker, repo_metadata, qadata): unknown_pkgs = set() - inherited_java_eclass = "java-pkg-2" in ebuild.inherited or \ - "java-pkg-opt-2" in ebuild.inherited, + inherited_java_eclass = ("java-pkg-2" in ebuild.inherited or + "java-pkg-opt-2" in ebuild.inherited) inherited_wxwidgets_eclass = "wxwidgets" in ebuild.inherited # operator_tokens = set(["||", "(", ")"]) badsyntax = [] diff --git a/repoman/lib/repoman/modules/scan/depend/profile.py b/repoman/lib/repoman/modules/scan/depend/profile.py index 7549a414d..e84995870 100644 --- a/repoman/lib/repoman/modules/scan/depend/profile.py +++ b/repoman/lib/repoman/modules/scan/depend/profile.py @@ -128,7 +128,7 @@ class ProfileDependsChecks(ScanBase): if self.options.jobs > 1: for future_done_set in async_iter_completed(self._iter_tasks(loop, executor, ebuild, pkg), max_jobs=self.options.jobs, max_load=self.options.load_average): - for task in (await future_done_set): + for task in await future_done_set: task, results = task.result() for result in results: self._check_result(task, result) diff --git a/repoman/lib/repoman/modules/scan/directories/__init__.py b/repoman/lib/repoman/modules/scan/directories/__init__.py index 276bc7ae9..1ddb1a5f8 100644 --- a/repoman/lib/repoman/modules/scan/directories/__init__.py +++ b/repoman/lib/repoman/modules/scan/directories/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Directories plug-in module for repoman. @@ -48,4 +48,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/scan/eapi/__init__.py b/repoman/lib/repoman/modules/scan/eapi/__init__.py index 94759fdd7..477d12030 100644 --- a/repoman/lib/repoman/modules/scan/eapi/__init__.py +++ b/repoman/lib/repoman/modules/scan/eapi/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Eapi plug-in module for repoman. @@ -28,4 +28,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/scan/ebuild/__init__.py b/repoman/lib/repoman/modules/scan/ebuild/__init__.py index 328a0d626..abae614c2 100644 --- a/repoman/lib/repoman/modules/scan/ebuild/__init__.py +++ b/repoman/lib/repoman/modules/scan/ebuild/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Ebuild plug-in module for repoman. @@ -58,4 +58,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/scan/eclasses/__init__.py b/repoman/lib/repoman/modules/scan/eclasses/__init__.py index 234ef9fca..557da95ae 100644 --- a/repoman/lib/repoman/modules/scan/eclasses/__init__.py +++ b/repoman/lib/repoman/modules/scan/eclasses/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Eclasses plug-in module for repoman. @@ -47,4 +47,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/scan/fetch/__init__.py b/repoman/lib/repoman/modules/scan/fetch/__init__.py index 30db3f529..15a232670 100644 --- a/repoman/lib/repoman/modules/scan/fetch/__init__.py +++ b/repoman/lib/repoman/modules/scan/fetch/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """fetches plug-in module for repoman. @@ -32,4 +32,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/scan/keywords/__init__.py b/repoman/lib/repoman/modules/scan/keywords/__init__.py index d4c1281bc..434be68ad 100644 --- a/repoman/lib/repoman/modules/scan/keywords/__init__.py +++ b/repoman/lib/repoman/modules/scan/keywords/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Keywords plug-in module for repoman. @@ -32,4 +32,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/scan/manifest/__init__.py b/repoman/lib/repoman/modules/scan/manifest/__init__.py index 9e05c5288..2399720e2 100644 --- a/repoman/lib/repoman/modules/scan/manifest/__init__.py +++ b/repoman/lib/repoman/modules/scan/manifest/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Ebuild plug-in module for repoman. @@ -29,4 +29,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/scan/metadata/__init__.py b/repoman/lib/repoman/modules/scan/metadata/__init__.py index fccde99b5..6a5016c0f 100644 --- a/repoman/lib/repoman/modules/scan/metadata/__init__.py +++ b/repoman/lib/repoman/modules/scan/metadata/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Metadata plug-in module for repoman. @@ -87,4 +87,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/scan/metadata/ebuild_metadata.py b/repoman/lib/repoman/modules/scan/metadata/ebuild_metadata.py index 6c0822897..4e137e80e 100644 --- a/repoman/lib/repoman/modules/scan/metadata/ebuild_metadata.py +++ b/repoman/lib/repoman/modules/scan/metadata/ebuild_metadata.py @@ -3,7 +3,6 @@ '''Ebuild Metadata Checks''' import re -import sys from repoman.modules.scan.scanbase import ScanBase diff --git a/repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py b/repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py index 3c38697fe..c1ba8e9f4 100644 --- a/repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py +++ b/repoman/lib/repoman/modules/scan/metadata/pkgmetadata.py @@ -24,10 +24,11 @@ except (ImportError, SystemError, RuntimeError, Exception): sys.exit(1) # import our initialized portage instance -from repoman._portage import portage +from repoman._portage import portage # pylint: disable=unused-import from repoman.metadata import metadata_dtd_uri from repoman.modules.scan.scanbase import ScanBase +# pylint: disable=ungrouped-imports from portage.exception import InvalidAtom from portage import os from portage.dep import Atom diff --git a/repoman/lib/repoman/modules/scan/metadata/restrict.py b/repoman/lib/repoman/modules/scan/metadata/restrict.py index f39128b24..6cd7b3012 100644 --- a/repoman/lib/repoman/modules/scan/metadata/restrict.py +++ b/repoman/lib/repoman/modules/scan/metadata/restrict.py @@ -54,4 +54,3 @@ class RestrictChecks(ScanBase): @property def runInEbuilds(self): return (True, [self.check]) - diff --git a/repoman/lib/repoman/modules/scan/options/__init__.py b/repoman/lib/repoman/modules/scan/options/__init__.py index ffce474e5..c95bf739f 100644 --- a/repoman/lib/repoman/modules/scan/options/__init__.py +++ b/repoman/lib/repoman/modules/scan/options/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Gentoo Foundation +# Copyright 2015-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 doc = """Options plug-in module for repoman. @@ -27,4 +27,3 @@ module_spec = { }, 'version': 1, } - diff --git a/repoman/lib/repoman/modules/vcs/None/status.py b/repoman/lib/repoman/modules/vcs/None/status.py index bd318b4a8..57615d626 100644 --- a/repoman/lib/repoman/modules/vcs/None/status.py +++ b/repoman/lib/repoman/modules/vcs/None/status.py @@ -50,4 +50,3 @@ class Status: @returns: Boolean ''' return False - diff --git a/repoman/lib/repoman/modules/vcs/__init__.py b/repoman/lib/repoman/modules/vcs/__init__.py index 84e837408..9c75485ae 100644 --- a/repoman/lib/repoman/modules/vcs/__init__.py +++ b/repoman/lib/repoman/modules/vcs/__init__.py @@ -11,4 +11,3 @@ module_controller = Modules(path=path, namepath="repoman.modules.vcs") # initial development debug info #print(module_controller.module_names) module_names = module_controller.module_names[:] - diff --git a/repoman/lib/repoman/modules/vcs/bzr/changes.py b/repoman/lib/repoman/modules/vcs/bzr/changes.py index 4d4808c08..fae90a735 100644 --- a/repoman/lib/repoman/modules/vcs/bzr/changes.py +++ b/repoman/lib/repoman/modules/vcs/bzr/changes.py @@ -4,7 +4,7 @@ Bazaar module Changes class submodule from repoman.modules.vcs.changes import ChangesBase from repoman._subprocess import repoman_popen -from repoman._portage import portage +from repoman._portage import portage # pylint: disable=unused-import from portage import os from portage.package.ebuild.digestgen import digestgen diff --git a/repoman/lib/repoman/modules/vcs/bzr/status.py b/repoman/lib/repoman/modules/vcs/bzr/status.py index f4a1a73e2..127fb21b5 100644 --- a/repoman/lib/repoman/modules/vcs/bzr/status.py +++ b/repoman/lib/repoman/modules/vcs/bzr/status.py @@ -4,6 +4,8 @@ Bazaar module Status class submodule from repoman._portage import portage from portage import os + +# pylint: disable=ungrouped-imports from repoman._subprocess import repoman_popen diff --git a/repoman/lib/repoman/modules/vcs/cvs/status.py b/repoman/lib/repoman/modules/vcs/cvs/status.py index 13c8b3450..697e5dc42 100644 --- a/repoman/lib/repoman/modules/vcs/cvs/status.py +++ b/repoman/lib/repoman/modules/vcs/cvs/status.py @@ -6,7 +6,7 @@ import logging import subprocess import sys -from repoman._portage import portage +from repoman._portage import portage # pylint: disable=unused-import from portage import os from portage.const import BASH_BINARY from portage.output import red, green diff --git a/repoman/lib/repoman/modules/vcs/git/changes.py b/repoman/lib/repoman/modules/vcs/git/changes.py index 9819831b5..94ca0e37d 100644 --- a/repoman/lib/repoman/modules/vcs/git/changes.py +++ b/repoman/lib/repoman/modules/vcs/git/changes.py @@ -5,9 +5,10 @@ Git module Changes class submodule import logging import sys +from repoman._portage import portage # pylint: disable=unused-import from repoman.modules.vcs.changes import ChangesBase from repoman._subprocess import repoman_popen -from repoman._portage import portage + from portage import os from portage.package.ebuild.digestgen import digestgen from portage.process import spawn diff --git a/repoman/lib/repoman/modules/vcs/git/status.py b/repoman/lib/repoman/modules/vcs/git/status.py index 374cb69c9..9ab76a9e2 100644 --- a/repoman/lib/repoman/modules/vcs/git/status.py +++ b/repoman/lib/repoman/modules/vcs/git/status.py @@ -6,6 +6,8 @@ import re from repoman._portage import portage from portage import os + +# pylint: disable=ungrouped-imports from repoman._subprocess import repoman_popen, repoman_getstatusoutput @@ -75,4 +77,3 @@ class Status: @returns: Boolean ''' return dirname in [".git"] - diff --git a/repoman/lib/repoman/modules/vcs/hg/changes.py b/repoman/lib/repoman/modules/vcs/hg/changes.py index 867057545..1ccaaf72b 100644 --- a/repoman/lib/repoman/modules/vcs/hg/changes.py +++ b/repoman/lib/repoman/modules/vcs/hg/changes.py @@ -2,9 +2,10 @@ Mercurial module Changes class submodule ''' +from repoman._portage import portage # pylint: disable=unused-import from repoman.modules.vcs.changes import ChangesBase from repoman._subprocess import repoman_popen -from repoman._portage import portage + from portage import os from portage.package.ebuild.digestgen import digestgen from portage.process import spawn diff --git a/repoman/lib/repoman/modules/vcs/hg/status.py b/repoman/lib/repoman/modules/vcs/hg/status.py index 2f9f0ba76..b9e919eb4 100644 --- a/repoman/lib/repoman/modules/vcs/hg/status.py +++ b/repoman/lib/repoman/modules/vcs/hg/status.py @@ -4,6 +4,8 @@ Mercurial module Status class submodule from repoman._portage import portage from portage import os + +# pylint: disable=ungrouped-imports from repoman._subprocess import repoman_popen diff --git a/repoman/lib/repoman/modules/vcs/svn/changes.py b/repoman/lib/repoman/modules/vcs/svn/changes.py index dfed1655b..5bf21393f 100644 --- a/repoman/lib/repoman/modules/vcs/svn/changes.py +++ b/repoman/lib/repoman/modules/vcs/svn/changes.py @@ -138,5 +138,3 @@ class Changes(ChangesBase): scanner.repolevel, scanner.reposplit, scanner.categories)): self.repoman_settings["O"] = os.path.join(self.repo_settings.repodir, x) digestgen(mysettings=self.repoman_settings, myportdb=self.repo_settings.portdb) - - diff --git a/repoman/lib/repoman/modules/vcs/svn/status.py b/repoman/lib/repoman/modules/vcs/svn/status.py index 568670a4b..c14505626 100644 --- a/repoman/lib/repoman/modules/vcs/svn/status.py +++ b/repoman/lib/repoman/modules/vcs/svn/status.py @@ -12,6 +12,7 @@ from portage.const import BASH_BINARY from portage.output import red, green from portage import _unicode_encode, _unicode_decode +# pylint: disable=ungrouped-imports from repoman._subprocess import repoman_popen diff --git a/repoman/lib/repoman/modules/vcs/vcs.py b/repoman/lib/repoman/modules/vcs/vcs.py index fbf99d458..919dca363 100644 --- a/repoman/lib/repoman/modules/vcs/vcs.py +++ b/repoman/lib/repoman/modules/vcs/vcs.py @@ -156,5 +156,3 @@ def vcs_new_changed(relative_path, mychanged, mynew): if x == relative_path: return True return False - - diff --git a/repoman/lib/repoman/repos.py b/repoman/lib/repoman/repos.py index 515c8cbc6..31cb82caf 100644 --- a/repoman/lib/repoman/repos.py +++ b/repoman/lib/repoman/repos.py @@ -15,6 +15,7 @@ from portage import _encodings from portage import _unicode_encode from portage.checksum import get_valid_checksum_keys +# pylint: disable=ungrouped-imports from repoman.errors import err from repoman.profile import ProfileDesc, valid_profile_types diff --git a/repoman/lib/repoman/tests/commit/__test__.py b/repoman/lib/repoman/tests/commit/__test__.py index 8b1378917..e69de29bb 100644 --- a/repoman/lib/repoman/tests/commit/__test__.py +++ b/repoman/lib/repoman/tests/commit/__test__.py @@ -1 +0,0 @@ - diff --git a/repoman/lib/repoman/tests/runTests.py b/repoman/lib/repoman/tests/runTests.py index 542acb870..41af05a2f 100644 --- a/repoman/lib/repoman/tests/runTests.py +++ b/repoman/lib/repoman/tests/runTests.py @@ -1,11 +1,11 @@ #!/usr/bin/env python # runTests.py -- Portage Unit Test Functionality -# Copyright 2006-2017 Gentoo Foundation +# Copyright 2006-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import os -import sys import os.path as osp +import sys import grp import platform import pwd @@ -41,17 +41,17 @@ sys.path.insert(0, portage_pym) # import our centrally initialized portage instance from repoman._portage import portage portage._internal_caller = True +import repoman.tests as tests # Ensure that we don't instantiate portage.settings, so that tests should # work the same regardless of global configuration file state/existence. portage._disable_legacy_globals() from portage.util._eventloop.global_event_loop import global_event_loop +from portage.const import PORTAGE_BIN_PATH if os.environ.get('NOCOLOR') in ('yes', 'true'): portage.output.nocolor() -import repoman.tests as tests -from portage.const import PORTAGE_BIN_PATH path = os.environ.get("PATH", "").split(":") path = [x for x in path if x] diff --git a/repoman/lib/repoman/tests/simple/__test__.py b/repoman/lib/repoman/tests/simple/__test__.py index 8b1378917..e69de29bb 100644 --- a/repoman/lib/repoman/tests/simple/__test__.py +++ b/repoman/lib/repoman/tests/simple/__test__.py @@ -1 +0,0 @@ - diff --git a/repoman/lib/repoman/tests/simple/test_simple.py b/repoman/lib/repoman/tests/simple/test_simple.py index c86a183f9..2448bb117 100644 --- a/repoman/lib/repoman/tests/simple/test_simple.py +++ b/repoman/lib/repoman/tests/simple/test_simple.py @@ -1,4 +1,4 @@ -# Copyright 2011-2018 Gentoo Foundation +# Copyright 2011-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import subprocess @@ -11,6 +11,8 @@ from portage import _unicode_decode from portage.process import find_binary from portage.tests.resolver.ResolverPlayground import ResolverPlayground from portage.util import ensure_dirs + +# pylint: disable=ungrouped-imports from repoman import REPOMAN_BASE_PATH from repoman.copyrights import update_copyright_year from repoman.tests import TestCase diff --git a/repoman/lib/repoman/utilities.py b/repoman/lib/repoman/utilities.py index c4c292227..930f4ccfb 100644 --- a/repoman/lib/repoman/utilities.py +++ b/repoman/lib/repoman/utilities.py @@ -1,6 +1,6 @@ # -*- coding:utf-8 -*- # repoman: Utilities -# Copyright 2007-2020 Gentoo Authors +# Copyright 2007-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 """This module contains utility functions to help repoman find ebuilds to @@ -23,7 +23,6 @@ from itertools import chain import logging import pwd import stat -import sys import time import textwrap import difflib @@ -42,7 +41,8 @@ from portage.localization import _ from portage.process import find_binary from portage.output import green -from repoman.copyrights import update_copyright, update_copyright_year +# pylint: disable=ungrouped-imports +from repoman.copyrights import update_copyright_year normalize_path = util.normalize_path
