Do not need to inherit object in py3. All tests passed.
Signed-off-by: Aaron Bauman <b...@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') -- 2.28.0