commit: 41f5049b14beb11e6ae768c8571e7a8a326f701c Author: Alec Warner <antarus <AT> gentoo <DOT> org> AuthorDate: Wed Jul 22 04:04:09 2020 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Wed Jul 22 16:53:06 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=41f5049b
Fix R0205 in repoman. Do not inherit from object in py3. Signed-off-by: Alec Warner <antarus <AT> gentoo.org> Change-Id: I52c8f46e16fa1dc9c2b90a6c9a5cdf4a417050a0 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> repoman/lib/repoman/actions.py | 2 +- repoman/lib/repoman/copyrights.py | 2 +- repoman/lib/repoman/modules/commit/manifest.py | 2 +- repoman/lib/repoman/modules/linechecks/base.py | 2 +- repoman/lib/repoman/modules/linechecks/config.py | 2 +- repoman/lib/repoman/modules/linechecks/controller.py | 2 +- repoman/lib/repoman/modules/scan/metadata/use_flags.py | 2 +- repoman/lib/repoman/modules/scan/module.py | 2 +- repoman/lib/repoman/modules/scan/scanbase.py | 2 +- repoman/lib/repoman/modules/vcs/None/status.py | 2 +- repoman/lib/repoman/modules/vcs/bzr/status.py | 2 +- repoman/lib/repoman/modules/vcs/changes.py | 2 +- repoman/lib/repoman/modules/vcs/cvs/status.py | 2 +- repoman/lib/repoman/modules/vcs/git/status.py | 2 +- repoman/lib/repoman/modules/vcs/hg/status.py | 2 +- repoman/lib/repoman/modules/vcs/settings.py | 2 +- repoman/lib/repoman/modules/vcs/svn/status.py | 2 +- repoman/lib/repoman/profile.py | 2 +- repoman/lib/repoman/qa_data.py | 2 +- repoman/lib/repoman/qa_tracker.py | 2 +- repoman/lib/repoman/repos.py | 2 +- repoman/lib/repoman/scanner.py | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/repoman/lib/repoman/actions.py b/repoman/lib/repoman/actions.py index 64593503a..1afc4acb1 100644 --- a/repoman/lib/repoman/actions.py +++ b/repoman/lib/repoman/actions.py @@ -41,7 +41,7 @@ from repoman import VERSION bad = create_color_func("BAD") -class Actions(object): +class Actions: '''Handles post check result output and performs the various vcs activities for committing the results''' diff --git a/repoman/lib/repoman/copyrights.py b/repoman/lib/repoman/copyrights.py index 275dcbc3f..9e5a32e34 100644 --- a/repoman/lib/repoman/copyrights.py +++ b/repoman/lib/repoman/copyrights.py @@ -20,7 +20,7 @@ _copyright_re2 = \ re.compile(br'^(# Copyright )(\d\d\d\d)( Gentoo (Foundation|Authors))\b') -class _copyright_repl(object): +class _copyright_repl: __slots__ = ('year',) def __init__(self, year): diff --git a/repoman/lib/repoman/modules/commit/manifest.py b/repoman/lib/repoman/modules/commit/manifest.py index 573710a62..e71c1abcb 100644 --- a/repoman/lib/repoman/modules/commit/manifest.py +++ b/repoman/lib/repoman/modules/commit/manifest.py @@ -11,7 +11,7 @@ from portage.package.ebuild.digestgen import digestgen from portage.util import writemsg_level -class Manifest(object): +class Manifest: '''Creates as well as checks pkg Manifest entries/files''' def __init__(self, **kwargs): diff --git a/repoman/lib/repoman/modules/linechecks/base.py b/repoman/lib/repoman/modules/linechecks/base.py index 39d7ebd78..bcd86773b 100644 --- a/repoman/lib/repoman/modules/linechecks/base.py +++ b/repoman/lib/repoman/modules/linechecks/base.py @@ -3,7 +3,7 @@ import logging import re -class LineCheck(object): +class LineCheck: """Run a check on a line of an ebuild.""" """A regular expression to determine whether to ignore the line""" ignore_line = False diff --git a/repoman/lib/repoman/modules/linechecks/config.py b/repoman/lib/repoman/modules/linechecks/config.py index 63a5bc44e..69cf8e8aa 100644 --- a/repoman/lib/repoman/modules/linechecks/config.py +++ b/repoman/lib/repoman/modules/linechecks/config.py @@ -35,7 +35,7 @@ def merge(dict1, dict2): return result -class LineChecksConfig(object): +class LineChecksConfig: '''Holds our LineChecks configuration data and operation functions''' def __init__(self, repo_settings): diff --git a/repoman/lib/repoman/modules/linechecks/controller.py b/repoman/lib/repoman/modules/linechecks/controller.py index a3dfd9bd1..50ca5229f 100644 --- a/repoman/lib/repoman/modules/linechecks/controller.py +++ b/repoman/lib/repoman/modules/linechecks/controller.py @@ -18,7 +18,7 @@ MODULES_PATH = os.path.dirname(__file__) logging.debug("LineChecks module path: %s", MODULES_PATH) -class LineCheckController(object): +class LineCheckController: '''Initializes and runs the LineCheck checks''' def __init__(self, repo_settings, linechecks): diff --git a/repoman/lib/repoman/modules/scan/metadata/use_flags.py b/repoman/lib/repoman/modules/scan/metadata/use_flags.py index 1738fd23e..d9ce8bee9 100644 --- a/repoman/lib/repoman/modules/scan/metadata/use_flags.py +++ b/repoman/lib/repoman/modules/scan/metadata/use_flags.py @@ -11,7 +11,7 @@ from portage import eapi from portage.eapi import eapi_has_iuse_defaults, eapi_has_required_use -class USEFlagChecks(object): +class USEFlagChecks: '''Performs checks on USE flags listed in the ebuilds and metadata.xml''' def __init__(self, **kwargs): diff --git a/repoman/lib/repoman/modules/scan/module.py b/repoman/lib/repoman/modules/scan/module.py index baed68989..3321cb224 100644 --- a/repoman/lib/repoman/modules/scan/module.py +++ b/repoman/lib/repoman/modules/scan/module.py @@ -19,7 +19,7 @@ MODULES_PATH = os.path.dirname(__file__) logging.debug("module path: %s", MODULES_PATH) -class ModuleConfig(object): +class ModuleConfig: '''Holds the scan modules configuration information and creates the ordered list of modulles to run''' diff --git a/repoman/lib/repoman/modules/scan/scanbase.py b/repoman/lib/repoman/modules/scan/scanbase.py index aea1bb121..8d7b46336 100644 --- a/repoman/lib/repoman/modules/scan/scanbase.py +++ b/repoman/lib/repoman/modules/scan/scanbase.py @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- -class ScanBase(object): +class ScanBase: '''Skeleton class for performing a scan for one or more items to check in a pkg directory or ebuild.''' diff --git a/repoman/lib/repoman/modules/vcs/None/status.py b/repoman/lib/repoman/modules/vcs/None/status.py index d6e5ca0e4..bd318b4a8 100644 --- a/repoman/lib/repoman/modules/vcs/None/status.py +++ b/repoman/lib/repoman/modules/vcs/None/status.py @@ -3,7 +3,7 @@ None (non-VCS) module Status class submodule ''' -class Status(object): +class Status: '''Performs status checks on the svn repository''' def __init__(self, qatracker, eadded): diff --git a/repoman/lib/repoman/modules/vcs/bzr/status.py b/repoman/lib/repoman/modules/vcs/bzr/status.py index 199e7f399..f4a1a73e2 100644 --- a/repoman/lib/repoman/modules/vcs/bzr/status.py +++ b/repoman/lib/repoman/modules/vcs/bzr/status.py @@ -7,7 +7,7 @@ from portage import os from repoman._subprocess import repoman_popen -class Status(object): +class Status: '''Performs status checks on the svn repository''' def __init__(self, qatracker, eadded): diff --git a/repoman/lib/repoman/modules/vcs/changes.py b/repoman/lib/repoman/modules/vcs/changes.py index aa4923f8f..3a19ae146 100644 --- a/repoman/lib/repoman/modules/vcs/changes.py +++ b/repoman/lib/repoman/modules/vcs/changes.py @@ -13,7 +13,7 @@ from portage import _unicode_encode from portage.process import spawn -class ChangesBase(object): +class ChangesBase: '''Base Class object to scan and hold the resultant data for all changes to process. ''' diff --git a/repoman/lib/repoman/modules/vcs/cvs/status.py b/repoman/lib/repoman/modules/vcs/cvs/status.py index 3ec88f125..13c8b3450 100644 --- a/repoman/lib/repoman/modules/vcs/cvs/status.py +++ b/repoman/lib/repoman/modules/vcs/cvs/status.py @@ -13,7 +13,7 @@ from portage.output import red, green from portage import _unicode_encode, _unicode_decode -class Status(object): +class Status: '''Performs status checks on the svn repository''' def __init__(self, qatracker, eadded): diff --git a/repoman/lib/repoman/modules/vcs/git/status.py b/repoman/lib/repoman/modules/vcs/git/status.py index e5aa9c741..374cb69c9 100644 --- a/repoman/lib/repoman/modules/vcs/git/status.py +++ b/repoman/lib/repoman/modules/vcs/git/status.py @@ -9,7 +9,7 @@ from portage import os from repoman._subprocess import repoman_popen, repoman_getstatusoutput -class Status(object): +class Status: '''Performs status checks on the git repository''' def __init__(self, qatracker, eadded): diff --git a/repoman/lib/repoman/modules/vcs/hg/status.py b/repoman/lib/repoman/modules/vcs/hg/status.py index 8443554f5..2f9f0ba76 100644 --- a/repoman/lib/repoman/modules/vcs/hg/status.py +++ b/repoman/lib/repoman/modules/vcs/hg/status.py @@ -7,7 +7,7 @@ from portage import os from repoman._subprocess import repoman_popen -class Status(object): +class Status: '''Performs status checks on the svn repository''' def __init__(self, qatracker, eadded): diff --git a/repoman/lib/repoman/modules/vcs/settings.py b/repoman/lib/repoman/modules/vcs/settings.py index ae4e0b3c4..f90f05963 100644 --- a/repoman/lib/repoman/modules/vcs/settings.py +++ b/repoman/lib/repoman/modules/vcs/settings.py @@ -13,7 +13,7 @@ from repoman.modules.vcs.vcs import FindVCS from repoman.qa_tracker import QATracker -class VCSSettings(object): +class VCSSettings: '''Holds various VCS settings''' def __init__(self, options=None, repoman_settings=None, repo_settings=None): diff --git a/repoman/lib/repoman/modules/vcs/svn/status.py b/repoman/lib/repoman/modules/vcs/svn/status.py index 6575fe0b0..568670a4b 100644 --- a/repoman/lib/repoman/modules/vcs/svn/status.py +++ b/repoman/lib/repoman/modules/vcs/svn/status.py @@ -15,7 +15,7 @@ from portage import _unicode_encode, _unicode_decode from repoman._subprocess import repoman_popen -class Status(object): +class Status: '''Performs status checks on the svn repository''' def __init__(self, qatracker, eadded): diff --git a/repoman/lib/repoman/profile.py b/repoman/lib/repoman/profile.py index f6ca789c2..b17389c55 100644 --- a/repoman/lib/repoman/profile.py +++ b/repoman/lib/repoman/profile.py @@ -7,7 +7,7 @@ from portage import os from portage.output import red -class ProfileDesc(object): +class ProfileDesc: __slots__ = ('abs_path', 'arch', 'status', 'sub_path', 'tree_path',) def __init__(self, arch, status, sub_path, tree_path): diff --git a/repoman/lib/repoman/qa_data.py b/repoman/lib/repoman/qa_data.py index 01141a617..afb403d8d 100644 --- a/repoman/lib/repoman/qa_data.py +++ b/repoman/lib/repoman/qa_data.py @@ -11,7 +11,7 @@ from repoman._portage import portage from repoman.config import load_config -class QAData(object): +class QAData: def __init__(self): # Create the main exported data variables diff --git a/repoman/lib/repoman/qa_tracker.py b/repoman/lib/repoman/qa_tracker.py index faaf8e398..12e1b88bc 100644 --- a/repoman/lib/repoman/qa_tracker.py +++ b/repoman/lib/repoman/qa_tracker.py @@ -3,7 +3,7 @@ import logging import sys -class QATracker(object): +class QATracker: '''Track all occurrances of Q/A problems detected''' def __init__(self, qacats=None, qawarnings=None): diff --git a/repoman/lib/repoman/repos.py b/repoman/lib/repoman/repos.py index 9c820b08c..515c8cbc6 100644 --- a/repoman/lib/repoman/repos.py +++ b/repoman/lib/repoman/repos.py @@ -22,7 +22,7 @@ GPG_KEY_ID_REGEX = r'(0x)?([0-9a-fA-F]{8}){1,5}!?' bad = portage.output.create_color_func("BAD") -class RepoSettings(object): +class RepoSettings: '''Holds our repo specific settings''' def __init__( diff --git a/repoman/lib/repoman/scanner.py b/repoman/lib/repoman/scanner.py index fdfe0ecca..8d2ce9052 100644 --- a/repoman/lib/repoman/scanner.py +++ b/repoman/lib/repoman/scanner.py @@ -24,7 +24,7 @@ from repoman.modules.vcs.vcs import vcs_files_to_cps DATA_TYPES = {'dict': dict, 'Future': ExtendedFuture, 'list': list, 'set': set} -class Scanner(object): +class Scanner: '''Primary scan class. Operates all the small Q/A tests and checks''' def __init__(self, repo_settings, myreporoot, config_root, options,