From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1192453-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5D50B138359 for <garchives@archives.gentoo.org>; Sat, 1 Aug 2020 01:57:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 934B9E095F; Sat, 1 Aug 2020 01:57:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 62C20E095F for <gentoo-commits@lists.gentoo.org>; Sat, 1 Aug 2020 01:57:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2769434F1EA for <gentoo-commits@lists.gentoo.org>; Sat, 1 Aug 2020 01:57:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C63827F for <gentoo-commits@lists.gentoo.org>; Sat, 1 Aug 2020 01:57:27 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <1596246989.a7777b9ce26be2f95cef697f7de35c6c198ffc6a.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: /, bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/chpathtool.py bin/doins.py bin/ebuild-ipc.py bin/egencache bin/portageq bin/socks5-server.py runtests X-VCS-Directories: / bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: a7777b9ce26be2f95cef697f7de35c6c198ffc6a X-VCS-Branch: master Date: Sat, 1 Aug 2020 01:57:27 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: da6caba2-59fb-4116-b6d5-38cd55aa8435 X-Archives-Hash: f12f65b5fa79e30519316e4d55fe938b commit: a7777b9ce26be2f95cef697f7de35c6c198ffc6a Author: Aaron Bauman <bman <AT> gentoo <DOT> org> AuthorDate: Sat Aug 1 01:33:05 2020 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sat Aug 1 01:56:29 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a7777b9c Fix R0205 across all of repo. Do not need to inherit object in py3. All tests passed. Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> bin/chpathtool.py | 2 +- bin/doins.py | 10 +++++----- bin/ebuild-ipc.py | 2 +- bin/egencache | 8 ++++---- bin/portageq | 2 +- bin/socks5-server.py | 2 +- runtests | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bin/chpathtool.py b/bin/chpathtool.py index c036046ae..120c1c93d 100755 --- a/bin/chpathtool.py +++ b/bin/chpathtool.py @@ -27,7 +27,7 @@ else: # magic module seems to be broken magic = None -class IsTextFile(object): +class IsTextFile: def __init__(self): if magic is not None: diff --git a/bin/doins.py b/bin/doins.py index a08e3f8c9..4929cb90a 100644 --- a/bin/doins.py +++ b/bin/doins.py @@ -150,7 +150,7 @@ def _set_timestamps(source_stat, dest): os.utime(dest, ns=(source_stat.st_atime_ns, source_stat.st_mtime_ns)) -class _InsInProcessInstallRunner(object): +class _InsInProcessInstallRunner: """Implements `install` command behavior running in a process.""" def __init__(self, opts, parsed_options): @@ -257,7 +257,7 @@ class _InsInProcessInstallRunner(object): return False -class _InsSubprocessInstallRunner(object): +class _InsSubprocessInstallRunner: """Runs `install` command in a subprocess to install a file.""" def __init__(self, split_options): @@ -283,7 +283,7 @@ class _InsSubprocessInstallRunner(object): return subprocess.call(command) == 0 -class _DirInProcessInstallRunner(object): +class _DirInProcessInstallRunner: """Implements `install` command behavior running in a process.""" def __init__(self, parsed_options): @@ -309,7 +309,7 @@ class _DirInProcessInstallRunner(object): _set_attributes(self._parsed_options, dest) -class _DirSubprocessInstallRunner(object): +class _DirSubprocessInstallRunner: """Runs `install` command to create a directory.""" def __init__(self, split_options): @@ -331,7 +331,7 @@ class _DirSubprocessInstallRunner(object): subprocess.check_call(command) -class _InstallRunner(object): +class _InstallRunner: """Handles `install` command operation. Runs operations which `install` command should work. If possible, diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py index d68d3f05e..be4a320ce 100755 --- a/bin/ebuild-ipc.py +++ b/bin/ebuild-ipc.py @@ -100,7 +100,7 @@ class FifoWriter(AbstractPollTask): os.close(self._fd) self._fd = None -class EbuildIpc(object): +class EbuildIpc: # Timeout for each individual communication attempt (we retry # as long as the daemon process appears to be alive). diff --git a/bin/egencache b/bin/egencache index 199d212ee..e3d7cbfc3 100755 --- a/bin/egencache +++ b/bin/egencache @@ -238,7 +238,7 @@ def parse_args(args): return parser, options, args -class GenCache(object): +class GenCache: def __init__(self, portdb, cp_iter=None, max_jobs=None, max_load=None, rsync=False): # The caller must set portdb.porttrees in order to constrain @@ -447,7 +447,7 @@ class GenCache(object): if hasattr(trg_cache, '_prune_empty_dirs'): trg_cache._prune_empty_dirs() -class GenPkgDescIndex(object): +class GenPkgDescIndex: def __init__(self, portdb, output_file): self.returncode = os.EX_OK self._portdb = portdb @@ -470,7 +470,7 @@ class GenPkgDescIndex(object): f.close() -class GenUseLocalDesc(object): +class GenUseLocalDesc: def __init__(self, portdb, output=None, preserve_comments=False): self.returncode = os.EX_OK @@ -665,7 +665,7 @@ class GenUseLocalDesc(object): os.utime(desc_path, (mtime, mtime)) -class GenChangeLogs(object): +class GenChangeLogs: def __init__(self, portdb, changelog_output, changelog_reversed, max_jobs=None, max_load=None): self.returncode = os.EX_OK diff --git a/bin/portageq b/bin/portageq index f8fc236d1..9fe5d68c1 100755 --- a/bin/portageq +++ b/bin/portageq @@ -1020,7 +1020,7 @@ docstrings['list_preserved_libs'] = """<eroot> list_preserved_libs.__doc__ = docstrings['list_preserved_libs'] -class MaintainerEmailMatcher(object): +class MaintainerEmailMatcher: def __init__(self, maintainer_emails): self._re = re.compile("^(%s)$" % "|".join(maintainer_emails), re.I) diff --git a/bin/socks5-server.py b/bin/socks5-server.py index 1d07c98ed..8a1a4d1be 100644 --- a/bin/socks5-server.py +++ b/bin/socks5-server.py @@ -24,7 +24,7 @@ except AttributeError: current_task = asyncio.Task.current_task -class Socks5Server(object): +class Socks5Server: """ An asynchronous SOCKSv5 server. """ diff --git a/runtests b/runtests index ca59e0074..8cbd9620f 100755 --- a/runtests +++ b/runtests @@ -36,7 +36,7 @@ PYTHON_NICE_VERSIONS = [ EPREFIX = os.environ.get('PORTAGE_OVERRIDE_EPREFIX', '/') -class Colors(object): +class Colors: """Simple object holding color constants.""" _COLORS_YES = ('y', 'yes', 'true')