1 |
commit: a7777b9ce26be2f95cef697f7de35c6c198ffc6a |
2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 1 01:33:05 2020 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 1 01:56:29 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a7777b9c |
7 |
|
8 |
Fix R0205 across all of repo. |
9 |
|
10 |
Do not need to inherit object in py3. |
11 |
|
12 |
All tests passed. |
13 |
|
14 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
15 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
16 |
|
17 |
bin/chpathtool.py | 2 +- |
18 |
bin/doins.py | 10 +++++----- |
19 |
bin/ebuild-ipc.py | 2 +- |
20 |
bin/egencache | 8 ++++---- |
21 |
bin/portageq | 2 +- |
22 |
bin/socks5-server.py | 2 +- |
23 |
runtests | 2 +- |
24 |
7 files changed, 14 insertions(+), 14 deletions(-) |
25 |
|
26 |
diff --git a/bin/chpathtool.py b/bin/chpathtool.py |
27 |
index c036046ae..120c1c93d 100755 |
28 |
--- a/bin/chpathtool.py |
29 |
+++ b/bin/chpathtool.py |
30 |
@@ -27,7 +27,7 @@ else: |
31 |
# magic module seems to be broken |
32 |
magic = None |
33 |
|
34 |
-class IsTextFile(object): |
35 |
+class IsTextFile: |
36 |
|
37 |
def __init__(self): |
38 |
if magic is not None: |
39 |
|
40 |
diff --git a/bin/doins.py b/bin/doins.py |
41 |
index a08e3f8c9..4929cb90a 100644 |
42 |
--- a/bin/doins.py |
43 |
+++ b/bin/doins.py |
44 |
@@ -150,7 +150,7 @@ def _set_timestamps(source_stat, dest): |
45 |
os.utime(dest, ns=(source_stat.st_atime_ns, source_stat.st_mtime_ns)) |
46 |
|
47 |
|
48 |
-class _InsInProcessInstallRunner(object): |
49 |
+class _InsInProcessInstallRunner: |
50 |
"""Implements `install` command behavior running in a process.""" |
51 |
|
52 |
def __init__(self, opts, parsed_options): |
53 |
@@ -257,7 +257,7 @@ class _InsInProcessInstallRunner(object): |
54 |
return False |
55 |
|
56 |
|
57 |
-class _InsSubprocessInstallRunner(object): |
58 |
+class _InsSubprocessInstallRunner: |
59 |
"""Runs `install` command in a subprocess to install a file.""" |
60 |
|
61 |
def __init__(self, split_options): |
62 |
@@ -283,7 +283,7 @@ class _InsSubprocessInstallRunner(object): |
63 |
return subprocess.call(command) == 0 |
64 |
|
65 |
|
66 |
-class _DirInProcessInstallRunner(object): |
67 |
+class _DirInProcessInstallRunner: |
68 |
"""Implements `install` command behavior running in a process.""" |
69 |
|
70 |
def __init__(self, parsed_options): |
71 |
@@ -309,7 +309,7 @@ class _DirInProcessInstallRunner(object): |
72 |
_set_attributes(self._parsed_options, dest) |
73 |
|
74 |
|
75 |
-class _DirSubprocessInstallRunner(object): |
76 |
+class _DirSubprocessInstallRunner: |
77 |
"""Runs `install` command to create a directory.""" |
78 |
|
79 |
def __init__(self, split_options): |
80 |
@@ -331,7 +331,7 @@ class _DirSubprocessInstallRunner(object): |
81 |
subprocess.check_call(command) |
82 |
|
83 |
|
84 |
-class _InstallRunner(object): |
85 |
+class _InstallRunner: |
86 |
"""Handles `install` command operation. |
87 |
|
88 |
Runs operations which `install` command should work. If possible, |
89 |
|
90 |
diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py |
91 |
index d68d3f05e..be4a320ce 100755 |
92 |
--- a/bin/ebuild-ipc.py |
93 |
+++ b/bin/ebuild-ipc.py |
94 |
@@ -100,7 +100,7 @@ class FifoWriter(AbstractPollTask): |
95 |
os.close(self._fd) |
96 |
self._fd = None |
97 |
|
98 |
-class EbuildIpc(object): |
99 |
+class EbuildIpc: |
100 |
|
101 |
# Timeout for each individual communication attempt (we retry |
102 |
# as long as the daemon process appears to be alive). |
103 |
|
104 |
diff --git a/bin/egencache b/bin/egencache |
105 |
index 199d212ee..e3d7cbfc3 100755 |
106 |
--- a/bin/egencache |
107 |
+++ b/bin/egencache |
108 |
@@ -238,7 +238,7 @@ def parse_args(args): |
109 |
|
110 |
return parser, options, args |
111 |
|
112 |
-class GenCache(object): |
113 |
+class GenCache: |
114 |
def __init__(self, portdb, cp_iter=None, max_jobs=None, max_load=None, |
115 |
rsync=False): |
116 |
# The caller must set portdb.porttrees in order to constrain |
117 |
@@ -447,7 +447,7 @@ class GenCache(object): |
118 |
if hasattr(trg_cache, '_prune_empty_dirs'): |
119 |
trg_cache._prune_empty_dirs() |
120 |
|
121 |
-class GenPkgDescIndex(object): |
122 |
+class GenPkgDescIndex: |
123 |
def __init__(self, portdb, output_file): |
124 |
self.returncode = os.EX_OK |
125 |
self._portdb = portdb |
126 |
@@ -470,7 +470,7 @@ class GenPkgDescIndex(object): |
127 |
|
128 |
f.close() |
129 |
|
130 |
-class GenUseLocalDesc(object): |
131 |
+class GenUseLocalDesc: |
132 |
def __init__(self, portdb, output=None, |
133 |
preserve_comments=False): |
134 |
self.returncode = os.EX_OK |
135 |
@@ -665,7 +665,7 @@ class GenUseLocalDesc(object): |
136 |
os.utime(desc_path, (mtime, mtime)) |
137 |
|
138 |
|
139 |
-class GenChangeLogs(object): |
140 |
+class GenChangeLogs: |
141 |
def __init__(self, portdb, changelog_output, changelog_reversed, |
142 |
max_jobs=None, max_load=None): |
143 |
self.returncode = os.EX_OK |
144 |
|
145 |
diff --git a/bin/portageq b/bin/portageq |
146 |
index f8fc236d1..9fe5d68c1 100755 |
147 |
--- a/bin/portageq |
148 |
+++ b/bin/portageq |
149 |
@@ -1020,7 +1020,7 @@ docstrings['list_preserved_libs'] = """<eroot> |
150 |
list_preserved_libs.__doc__ = docstrings['list_preserved_libs'] |
151 |
|
152 |
|
153 |
-class MaintainerEmailMatcher(object): |
154 |
+class MaintainerEmailMatcher: |
155 |
def __init__(self, maintainer_emails): |
156 |
self._re = re.compile("^(%s)$" % "|".join(maintainer_emails), re.I) |
157 |
|
158 |
|
159 |
diff --git a/bin/socks5-server.py b/bin/socks5-server.py |
160 |
index 1d07c98ed..8a1a4d1be 100644 |
161 |
--- a/bin/socks5-server.py |
162 |
+++ b/bin/socks5-server.py |
163 |
@@ -24,7 +24,7 @@ except AttributeError: |
164 |
current_task = asyncio.Task.current_task |
165 |
|
166 |
|
167 |
-class Socks5Server(object): |
168 |
+class Socks5Server: |
169 |
""" |
170 |
An asynchronous SOCKSv5 server. |
171 |
""" |
172 |
|
173 |
diff --git a/runtests b/runtests |
174 |
index ca59e0074..8cbd9620f 100755 |
175 |
--- a/runtests |
176 |
+++ b/runtests |
177 |
@@ -36,7 +36,7 @@ PYTHON_NICE_VERSIONS = [ |
178 |
EPREFIX = os.environ.get('PORTAGE_OVERRIDE_EPREFIX', '/') |
179 |
|
180 |
|
181 |
-class Colors(object): |
182 |
+class Colors: |
183 |
"""Simple object holding color constants.""" |
184 |
|
185 |
_COLORS_YES = ('y', 'yes', 'true') |