[gentoo-portage-dev] [PATCH] Fix R0205 across all of repo. - gentoo-portage-dev

From:	Aaron Bauman <bman@g.o>
To:	gentoo-portage-dev@l.g.o
Cc:	Aaron Bauman <bman@g.o>
Subject:	[gentoo-portage-dev] [PATCH] Fix R0205 across all of repo.
Date:	Sat, 01 Aug 2020 01:33:21
Message-Id:	`20200801013305.281743-1-bman@gentoo.org`

1

Do not need to inherit object in py3.

2

3

All tests passed.

4

5

Signed-off-by: Aaron Bauman <bman@g.o>

6

---

7

 bin/chpathtool.py    |  2 +-

8

 bin/doins.py         | 10 +++++-----

9

 bin/ebuild-ipc.py    |  2 +-

10

 bin/egencache        |  8 ++++----

11

 bin/portageq         |  2 +-

12

 bin/socks5-server.py |  2 +-

13

 runtests             |  2 +-

14

 7 files changed, 14 insertions(+), 14 deletions(-)

15

16

diff --git a/bin/chpathtool.py b/bin/chpathtool.py

17

index c036046ae..120c1c93d 100755

18

--- a/bin/chpathtool.py

19

+++ b/bin/chpathtool.py

20

@@ -27,7 +27,7 @@ else:

21

 		# magic module seems to be broken

22

 		magic = None

23

24

-class IsTextFile(object):

25

+class IsTextFile:

26

27

 	def __init__(self):

28

 		if magic is not None:

29

diff --git a/bin/doins.py b/bin/doins.py

30

index a08e3f8c9..4929cb90a 100644

31

--- a/bin/doins.py

32

+++ b/bin/doins.py

33

@@ -150,7 +150,7 @@ def _set_timestamps(source_stat, dest):

34

 	os.utime(dest, ns=(source_stat.st_atime_ns, source_stat.st_mtime_ns))

35

36

37

-class _InsInProcessInstallRunner(object):

38

+class _InsInProcessInstallRunner:

39

 	"""Implements `install` command behavior running in a process."""

40

41

 	def __init__(self, opts, parsed_options):

42

@@ -257,7 +257,7 @@ class _InsInProcessInstallRunner(object):

43

 		return False

44

45

46

-class _InsSubprocessInstallRunner(object):

47

+class _InsSubprocessInstallRunner:

48

 	"""Runs `install` command in a subprocess to install a file."""

49

50

 	def __init__(self, split_options):

51

@@ -283,7 +283,7 @@ class _InsSubprocessInstallRunner(object):

52

 		return subprocess.call(command) == 0

53

54

55

-class _DirInProcessInstallRunner(object):

56

+class _DirInProcessInstallRunner:

57

 	"""Implements `install` command behavior running in a process."""

58

59

 	def __init__(self, parsed_options):

60

@@ -309,7 +309,7 @@ class _DirInProcessInstallRunner(object):

61

 		_set_attributes(self._parsed_options, dest)

62

63

64

-class _DirSubprocessInstallRunner(object):

65

+class _DirSubprocessInstallRunner:

66

 	"""Runs `install` command to create a directory."""

67

68

 	def __init__(self, split_options):

69

@@ -331,7 +331,7 @@ class _DirSubprocessInstallRunner(object):

70

 		subprocess.check_call(command)

71

72

73

-class _InstallRunner(object):

74

+class _InstallRunner:

75

 	"""Handles `install` command operation.

76

77

 	Runs operations which `install` command should work. If possible,

78

diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py

79

index d68d3f05e..be4a320ce 100755

80

--- a/bin/ebuild-ipc.py

81

+++ b/bin/ebuild-ipc.py

82

@@ -100,7 +100,7 @@ class FifoWriter(AbstractPollTask):

83

 			os.close(self._fd)

84

 			self._fd = None

85

86

-class EbuildIpc(object):

87

+class EbuildIpc:

88

89

 	# Timeout for each individual communication attempt (we retry

90

 	# as long as the daemon process appears to be alive).

91

diff --git a/bin/egencache b/bin/egencache

92

index 199d212ee..e3d7cbfc3 100755

93

--- a/bin/egencache

94

+++ b/bin/egencache

95

@@ -238,7 +238,7 @@ def parse_args(args):

96

97

 	return parser, options, args

98

99

-class GenCache(object):

100

+class GenCache:

101

 	def __init__(self, portdb, cp_iter=None, max_jobs=None, max_load=None,

102

 		rsync=False):

103

 		# The caller must set portdb.porttrees in order to constrain

104

@@ -447,7 +447,7 @@ class GenCache(object):

105

 		if hasattr(trg_cache, '_prune_empty_dirs'):

106

 			trg_cache._prune_empty_dirs()

107

108

-class GenPkgDescIndex(object):

109

+class GenPkgDescIndex:

110

 	def __init__(self, portdb, output_file):

111

 		self.returncode = os.EX_OK

112

 		self._portdb = portdb

113

@@ -470,7 +470,7 @@ class GenPkgDescIndex(object):

114

115

 		f.close()

116

117

-class GenUseLocalDesc(object):

118

+class GenUseLocalDesc:

119

 	def __init__(self, portdb, output=None,

120

 			preserve_comments=False):

121

 		self.returncode = os.EX_OK

122

@@ -665,7 +665,7 @@ class GenUseLocalDesc(object):

123

 		os.utime(desc_path, (mtime, mtime))

124

125

126

-class GenChangeLogs(object):

127

+class GenChangeLogs:

128

 	def __init__(self, portdb, changelog_output, changelog_reversed,

129

 		max_jobs=None, max_load=None):

130

 		self.returncode = os.EX_OK

131

diff --git a/bin/portageq b/bin/portageq

132

index f8fc236d1..9fe5d68c1 100755

133

--- a/bin/portageq

134

+++ b/bin/portageq

135

@@ -1020,7 +1020,7 @@ docstrings['list_preserved_libs'] = """<eroot>

136

 list_preserved_libs.__doc__ = docstrings['list_preserved_libs']

137

138

139

-class MaintainerEmailMatcher(object):

140

+class MaintainerEmailMatcher:

141

 	def __init__(self, maintainer_emails):

142

 		self._re = re.compile("^(%s)$" % "|".join(maintainer_emails), re.I)

143

144

diff --git a/bin/socks5-server.py b/bin/socks5-server.py

145

index 1d07c98ed..8a1a4d1be 100644

146

--- a/bin/socks5-server.py

147

+++ b/bin/socks5-server.py

148

@@ -24,7 +24,7 @@ except AttributeError:

149

 	current_task = asyncio.Task.current_task

150

151

152

-class Socks5Server(object):

153

+class Socks5Server:

154

"""

155

 	An asynchronous SOCKSv5 server.

156

"""

157

diff --git a/runtests b/runtests

158

index ca59e0074..8cbd9620f 100755

159

--- a/runtests

160

+++ b/runtests

161

@@ -36,7 +36,7 @@ PYTHON_NICE_VERSIONS = [

162

 EPREFIX = os.environ.get('PORTAGE_OVERRIDE_EPREFIX', '/')

163

164

165

-class Colors(object):

166

+class Colors:

167

 	"""Simple object holding color constants."""

168

169

 	_COLORS_YES = ('y', 'yes', 'true')

170

--

171

2.28.0

Gentoo Archives: gentoo-portage-dev

Replies

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